Commit 7beeab1a authored by Linus Torvalds's avatar Linus Torvalds

Merge http://gkernel.bkbits.net/net-drivers-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 664a55c9 887e8e0f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* front fifo request expires. * front fifo request expires.
*/ */
static int read_expire = HZ / 2; /* 500ms start timeout */ static int read_expire = HZ / 2; /* 500ms start timeout */
static int fifo_batch = 64; /* 4 seeks, or 64 contig */ static int fifo_batch = 32; /* 4 seeks, or 64 contig */
static int seek_cost = 16; /* seek is 16 times more expensive */ static int seek_cost = 16; /* seek is 16 times more expensive */
/* /*
...@@ -162,9 +162,8 @@ deadline_merge(request_queue_t *q, struct request **req, struct bio *bio) ...@@ -162,9 +162,8 @@ deadline_merge(request_queue_t *q, struct request **req, struct bio *bio)
if (elv_rq_merge_ok(__rq, bio)) { if (elv_rq_merge_ok(__rq, bio)) {
*req = __rq; *req = __rq;
q->last_merge = &__rq->queuelist;
ret = ELEVATOR_BACK_MERGE; ret = ELEVATOR_BACK_MERGE;
goto out_ret; goto out;
} }
} }
...@@ -191,23 +190,26 @@ deadline_merge(request_queue_t *q, struct request **req, struct bio *bio) ...@@ -191,23 +190,26 @@ deadline_merge(request_queue_t *q, struct request **req, struct bio *bio)
ret = elv_try_merge(__rq, bio); ret = elv_try_merge(__rq, bio);
if (ret != ELEVATOR_NO_MERGE) { if (ret != ELEVATOR_NO_MERGE) {
*req = __rq; *req = __rq;
q->last_merge = &__rq->queuelist;
break; break;
} }
} }
} }
out: out:
if (ret != ELEVATOR_NO_MERGE) {
struct deadline_rq *drq = RQ_DATA(*req);
deadline_del_rq_hash(drq);
deadline_add_rq_hash(dd, drq);
}
out_ret:
return ret; return ret;
} }
static void deadline_merged_request(request_queue_t *q, struct request *req)
{
struct deadline_data *dd = q->elevator.elevator_data;
struct deadline_rq *drq = RQ_DATA(req);
deadline_del_rq_hash(drq);
deadline_add_rq_hash(dd, drq);
q->last_merge = &req->queuelist;
}
static void static void
deadline_merge_request(request_queue_t *q, struct request *req, struct request *next) deadline_merge_request(request_queue_t *q, struct request *req, struct request *next)
{ {
...@@ -255,8 +257,18 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq) ...@@ -255,8 +257,18 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq)
sector_t last_sec = dd->last_sector; sector_t last_sec = dd->last_sector;
int batch_count = dd->fifo_batch; int batch_count = dd->fifo_batch;
/*
* if dispatch is non-empty, disregard last_sector and check last one
*/
if (!list_empty(dd->dispatch)) {
struct request *__rq = list_entry_rq(dd->dispatch->prev);
last_sec = __rq->sector + __rq->nr_sectors;
}
do { do {
struct list_head *nxt = rq->queuelist.next; struct list_head *nxt = rq->queuelist.next;
int this_rq_cost;
/* /*
* take it off the sort and fifo list, move * take it off the sort and fifo list, move
...@@ -264,17 +276,23 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq) ...@@ -264,17 +276,23 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq)
*/ */
deadline_move_to_dispatch(dd, rq); deadline_move_to_dispatch(dd, rq);
/*
* if this is the last entry, don't bother doing accounting
*/
if (nxt == sort_head)
break;
this_rq_cost = dd->seek_cost;
if (rq->sector == last_sec) if (rq->sector == last_sec)
batch_count--; this_rq_cost = (rq->nr_sectors + 255) >> 8;
else
batch_count -= dd->seek_cost;
if (nxt == sort_head) batch_count -= this_rq_cost;
if (batch_count <= 0)
break; break;
last_sec = rq->sector + rq->nr_sectors; last_sec = rq->sector + rq->nr_sectors;
rq = list_entry_rq(nxt); rq = list_entry_rq(nxt);
} while (batch_count > 0); } while (1);
} }
/* /*
...@@ -283,16 +301,17 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq) ...@@ -283,16 +301,17 @@ static void deadline_move_requests(struct deadline_data *dd, struct request *rq)
#define list_entry_fifo(ptr) list_entry((ptr), struct deadline_rq, fifo) #define list_entry_fifo(ptr) list_entry((ptr), struct deadline_rq, fifo)
static inline int deadline_check_fifo(struct deadline_data *dd) static inline int deadline_check_fifo(struct deadline_data *dd)
{ {
struct deadline_rq *drq; if (!list_empty(&dd->read_fifo)) {
struct deadline_rq *drq = list_entry_fifo(dd->read_fifo.next);
if (list_empty(&dd->read_fifo)) /*
return 0; * drq is expired!
*/
drq = list_entry_fifo(dd->read_fifo.next); if (time_after(jiffies, drq->expires))
if (time_before(jiffies, drq->expires)) return 1;
return 0; }
return 1; return 0;
} }
static struct request *deadline_next_request(request_queue_t *q) static struct request *deadline_next_request(request_queue_t *q)
...@@ -411,8 +430,9 @@ static int deadline_queue_empty(request_queue_t *q) ...@@ -411,8 +430,9 @@ static int deadline_queue_empty(request_queue_t *q)
{ {
struct deadline_data *dd = q->elevator.elevator_data; struct deadline_data *dd = q->elevator.elevator_data;
if (!list_empty(&q->queue_head) || !list_empty(&dd->sort_list[READ]) if (!list_empty(&dd->sort_list[WRITE]) ||
|| !list_empty(&dd->sort_list[WRITE])) !list_empty(&dd->sort_list[READ]) ||
!list_empty(&q->queue_head))
return 0; return 0;
BUG_ON(!list_empty(&dd->read_fifo)); BUG_ON(!list_empty(&dd->read_fifo));
...@@ -544,6 +564,7 @@ module_init(deadline_slab_setup); ...@@ -544,6 +564,7 @@ module_init(deadline_slab_setup);
elevator_t iosched_deadline = { elevator_t iosched_deadline = {
.elevator_merge_fn = deadline_merge, .elevator_merge_fn = deadline_merge,
.elevator_merged_fn = deadline_merged_request,
.elevator_merge_req_fn = deadline_merge_request, .elevator_merge_req_fn = deadline_merge_request,
.elevator_next_req_fn = deadline_next_request, .elevator_next_req_fn = deadline_next_request,
.elevator_add_req_fn = deadline_add_request, .elevator_add_req_fn = deadline_add_request,
......
...@@ -250,6 +250,14 @@ int elv_merge(request_queue_t *q, struct request **rq, struct bio *bio) ...@@ -250,6 +250,14 @@ int elv_merge(request_queue_t *q, struct request **rq, struct bio *bio)
return ELEVATOR_NO_MERGE; return ELEVATOR_NO_MERGE;
} }
void elv_merged_request(request_queue_t *q, struct request *rq)
{
elevator_t *e = &q->elevator;
if (e->elevator_merged_fn)
e->elevator_merged_fn(q, rq);
}
void elv_merge_requests(request_queue_t *q, struct request *rq, void elv_merge_requests(request_queue_t *q, struct request *rq,
struct request *next) struct request *next)
{ {
......
...@@ -1606,6 +1606,7 @@ static int __make_request(request_queue_t *q, struct bio *bio) ...@@ -1606,6 +1606,7 @@ static int __make_request(request_queue_t *q, struct bio *bio)
req->biotail = bio; req->biotail = bio;
req->nr_sectors = req->hard_nr_sectors += nr_sectors; req->nr_sectors = req->hard_nr_sectors += nr_sectors;
drive_stat_acct(req, nr_sectors, 0); drive_stat_acct(req, nr_sectors, 0);
elv_merged_request(q, req);
attempt_back_merge(q, req); attempt_back_merge(q, req);
goto out; goto out;
...@@ -1629,6 +1630,7 @@ static int __make_request(request_queue_t *q, struct bio *bio) ...@@ -1629,6 +1630,7 @@ static int __make_request(request_queue_t *q, struct bio *bio)
req->sector = req->hard_sector = sector; req->sector = req->hard_sector = sector;
req->nr_sectors = req->hard_nr_sectors += nr_sectors; req->nr_sectors = req->hard_nr_sectors += nr_sectors;
drive_stat_acct(req, nr_sectors, 0); drive_stat_acct(req, nr_sectors, 0);
elv_merged_request(q, req);
attempt_front_merge(q, req); attempt_front_merge(q, req);
goto out; goto out;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> */ SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> */
/* $Id: i2c-core.c,v 1.83 2002/07/08 01:37:15 mds Exp $ */ /* $Id: i2c-core.c,v 1.86 2002/09/12 06:47:26 ac9410 Exp $ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/init.h> #include <linux/init.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)
#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
#endif
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* ----- global defines ---------------------------------------------------- */ /* ----- global defines ---------------------------------------------------- */
...@@ -72,7 +68,7 @@ static struct i2c_driver *drivers[I2C_DRIVER_MAX]; ...@@ -72,7 +68,7 @@ static struct i2c_driver *drivers[I2C_DRIVER_MAX];
static int driver_count; static int driver_count;
/**** debug level */ /**** debug level */
static int i2c_debug=1; static int i2c_debug;
/* --------------------------------------------------- /* ---------------------------------------------------
* /proc entry declarations * /proc entry declarations
...@@ -84,10 +80,6 @@ static int i2c_debug=1; ...@@ -84,10 +80,6 @@ static int i2c_debug=1;
static int i2cproc_init(void); static int i2cproc_init(void);
static int i2cproc_cleanup(void); static int i2cproc_cleanup(void);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,27))
static void monitor_bus_i2c(struct inode *inode, int fill);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
static ssize_t i2cproc_bus_read(struct file * file, char * buf,size_t count, static ssize_t i2cproc_bus_read(struct file * file, char * buf,size_t count,
loff_t *ppos); loff_t *ppos);
static int read_bus_i2c(char *buf, char **start, off_t offset, int len, static int read_bus_i2c(char *buf, char **start, off_t offset, int len,
...@@ -99,12 +91,6 @@ static struct file_operations i2cproc_operations = { ...@@ -99,12 +91,6 @@ static struct file_operations i2cproc_operations = {
read: i2cproc_bus_read, read: i2cproc_bus_read,
}; };
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,48))
static struct inode_operations i2cproc_inode_operations = {
&i2cproc_operations
};
#endif
static int i2cproc_initialized = 0; static int i2cproc_initialized = 0;
#else /* undef CONFIG_PROC_FS */ #else /* undef CONFIG_PROC_FS */
...@@ -164,16 +150,8 @@ int i2c_add_adapter(struct i2c_adapter *adap) ...@@ -164,16 +150,8 @@ int i2c_add_adapter(struct i2c_adapter *adap)
goto ERROR1; goto ERROR1;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,48))
proc_entry->proc_fops = &i2cproc_operations; proc_entry->proc_fops = &i2cproc_operations;
#else
proc_entry->ops = &i2cproc_inode_operations;
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))
proc_entry->owner = THIS_MODULE; proc_entry->owner = THIS_MODULE;
#else
proc_entry->fill_inode = &monitor_bus_i2c;
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
adap->inode = proc_entry->low_ino; adap->inode = proc_entry->low_ino;
} }
...@@ -611,18 +589,6 @@ int i2c_release_client(struct i2c_client *client) ...@@ -611,18 +589,6 @@ int i2c_release_client(struct i2c_client *client)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,27))
/* Monitor access to /proc/bus/i2c*; make unloading i2c-proc impossible
if some process still uses it or some file in it */
void monitor_bus_i2c(struct inode *inode, int fill)
{
if (fill)
MOD_INC_USE_COUNT;
else
MOD_DEC_USE_COUNT;
}
#endif /* (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,37)) */
/* This function generates the output for /proc/bus/i2c */ /* This function generates the output for /proc/bus/i2c */
int read_bus_i2c(char *buf, char **start, off_t offset, int len, int *eof, int read_bus_i2c(char *buf, char **start, off_t offset, int len, int *eof,
void *private) void *private)
...@@ -658,18 +624,19 @@ ssize_t i2cproc_bus_read(struct file * file, char * buf,size_t count, ...@@ -658,18 +624,19 @@ ssize_t i2cproc_bus_read(struct file * file, char * buf,size_t count,
struct i2c_client *client; struct i2c_client *client;
int i,j,k,order_nr,len=0,len_total; int i,j,k,order_nr,len=0,len_total;
int order[I2C_CLIENT_MAX]; int order[I2C_CLIENT_MAX];
#define OUTPUT_LENGTH_PER_LINE 70
if (count > 4096)
return -EINVAL;
len_total = file->f_pos + count; len_total = file->f_pos + count;
/* Too bad if this gets longer (unlikely) */ if (len_total > (I2C_CLIENT_MAX * OUTPUT_LENGTH_PER_LINE) )
if (len_total > 4096) /* adjust to maximum file size */
len_total = 4096; len_total = (I2C_CLIENT_MAX * OUTPUT_LENGTH_PER_LINE);
for (i = 0; i < I2C_ADAP_MAX; i++) for (i = 0; i < I2C_ADAP_MAX; i++)
if (adapters[i]->inode == inode->i_ino) { if (adapters[i]->inode == inode->i_ino) {
/* We need a bit of slack in the kernel buffer; this makes the /* We need a bit of slack in the kernel buffer; this makes the
sprintf safe. */ sprintf safe. */
if (! (kbuf = kmalloc(count + 80,GFP_KERNEL))) if (! (kbuf = kmalloc(len_total +
OUTPUT_LENGTH_PER_LINE,
GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
/* Order will hold the indexes of the clients /* Order will hold the indexes of the clients
sorted by address */ sorted by address */
...@@ -731,11 +698,7 @@ int i2cproc_init(void) ...@@ -731,11 +698,7 @@ int i2cproc_init(void)
return -ENOENT; return -ENOENT;
} }
proc_bus_i2c->read_proc = &read_bus_i2c; proc_bus_i2c->read_proc = &read_bus_i2c;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))
proc_bus_i2c->owner = THIS_MODULE; proc_bus_i2c->owner = THIS_MODULE;
#else
proc_bus_i2c->fill_inode = &monitor_bus_i2c;
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27)) */
i2cproc_initialized += 2; i2cproc_initialized += 2;
return 0; return 0;
} }
...@@ -1492,6 +1455,11 @@ static int __init i2c_init(void) ...@@ -1492,6 +1455,11 @@ static int __init i2c_init(void)
return 0; return 0;
} }
static void __exit i2c_exit(void)
{
i2cproc_cleanup();
}
#ifndef MODULE #ifndef MODULE
#ifdef CONFIG_I2C_CHARDEV #ifdef CONFIG_I2C_CHARDEV
extern int i2c_dev_init(void); extern int i2c_dev_init(void);
...@@ -1622,20 +1590,11 @@ EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data); ...@@ -1622,20 +1590,11 @@ EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
EXPORT_SYMBOL(i2c_get_functionality); EXPORT_SYMBOL(i2c_get_functionality);
EXPORT_SYMBOL(i2c_check_functionality); EXPORT_SYMBOL(i2c_check_functionality);
#ifdef MODULE
MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>"); MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C-Bus main module"); MODULE_DESCRIPTION("I2C-Bus main module");
MODULE_PARM(i2c_debug, "i"); MODULE_PARM(i2c_debug, "i");
MODULE_PARM_DESC(i2c_debug,"debug level"); MODULE_PARM_DESC(i2c_debug,"debug level");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
int init_module(void) module_init(i2c_init);
{ module_exit(i2c_exit);
return i2c_init();
}
void cleanup_module(void)
{
i2cproc_cleanup();
}
#endif
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/version.h> #include <linux/version.h>
#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#endif #endif
...@@ -52,16 +50,8 @@ ...@@ -52,16 +50,8 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
#ifdef MODULE
extern int init_module(void);
extern int cleanup_module(void);
#endif /* def MODULE */
/* struct file_operations changed too often in the 2.1 series for nice code */ /* struct file_operations changed too often in the 2.1 series for nice code */
#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,9)
static loff_t i2cdev_lseek (struct file *file, loff_t offset, int origin);
#endif
static ssize_t i2cdev_read (struct file *file, char *buf, size_t count, static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
loff_t *offset); loff_t *offset);
static ssize_t i2cdev_write (struct file *file, const char *buf, size_t count, static ssize_t i2cdev_write (struct file *file, const char *buf, size_t count,
...@@ -78,23 +68,9 @@ static int i2cdev_detach_client(struct i2c_client *client); ...@@ -78,23 +68,9 @@ static int i2cdev_detach_client(struct i2c_client *client);
static int i2cdev_command(struct i2c_client *client, unsigned int cmd, static int i2cdev_command(struct i2c_client *client, unsigned int cmd,
void *arg); void *arg);
#ifdef MODULE
static
#else
extern
#endif
int __init i2c_dev_init(void);
static int i2cdev_cleanup(void);
static struct file_operations i2cdev_fops = { static struct file_operations i2cdev_fops = {
#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
owner: THIS_MODULE, owner: THIS_MODULE,
#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,9)
llseek: i2cdev_lseek,
#else
llseek: no_llseek, llseek: no_llseek,
#endif
read: i2cdev_read, read: i2cdev_read,
write: i2cdev_write, write: i2cdev_write,
ioctl: i2cdev_ioctl, ioctl: i2cdev_ioctl,
...@@ -132,20 +108,6 @@ static struct i2c_client i2cdev_client_template = { ...@@ -132,20 +108,6 @@ static struct i2c_client i2cdev_client_template = {
static int i2cdev_initialized; static int i2cdev_initialized;
#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,9)
/* Note that the lseek function is called llseek in 2.1 kernels. But things
are complicated enough as is. */
loff_t i2cdev_lseek (struct file *file, loff_t offset, int origin)
{
#ifdef DEBUG
struct inode *inode = file->f_dentry->d_inode;
printk(KERN_DEBUG "i2c-dev.o: i2c-%d lseek to %ld bytes relative to %d.\n",
minor(inode->i_rdev),(long) offset,origin);
#endif /* DEBUG */
return -ESPIPE;
}
#endif
static ssize_t i2cdev_read (struct file *file, char *buf, size_t count, static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
loff_t *offset) loff_t *offset)
{ {
...@@ -411,9 +373,6 @@ int i2cdev_open (struct inode *inode, struct file *file) ...@@ -411,9 +373,6 @@ int i2cdev_open (struct inode *inode, struct file *file)
if (i2cdev_adaps[minor]->inc_use) if (i2cdev_adaps[minor]->inc_use)
i2cdev_adaps[minor]->inc_use(i2cdev_adaps[minor]); i2cdev_adaps[minor]->inc_use(i2cdev_adaps[minor]);
#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0)
MOD_INC_USE_COUNT;
#endif /* LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0) */
#ifdef DEBUG #ifdef DEBUG
printk(KERN_DEBUG "i2c-dev.o: opened i2c-%d\n",minor); printk(KERN_DEBUG "i2c-dev.o: opened i2c-%d\n",minor);
...@@ -429,16 +388,10 @@ static int i2cdev_release (struct inode *inode, struct file *file) ...@@ -429,16 +388,10 @@ static int i2cdev_release (struct inode *inode, struct file *file)
#ifdef DEBUG #ifdef DEBUG
printk(KERN_DEBUG "i2c-dev.o: Closed: i2c-%d\n", minor); printk(KERN_DEBUG "i2c-dev.o: Closed: i2c-%d\n", minor);
#endif #endif
#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0)
MOD_DEC_USE_COUNT;
#else /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
lock_kernel(); lock_kernel();
#endif /* LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0) */
if (i2cdev_adaps[minor]->dec_use) if (i2cdev_adaps[minor]->dec_use)
i2cdev_adaps[minor]->dec_use(i2cdev_adaps[minor]); i2cdev_adaps[minor]->dec_use(i2cdev_adaps[minor]);
#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
unlock_kernel(); unlock_kernel();
#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
return 0; return 0;
} }
...@@ -491,6 +444,30 @@ static int i2cdev_command(struct i2c_client *client, unsigned int cmd, ...@@ -491,6 +444,30 @@ static int i2cdev_command(struct i2c_client *client, unsigned int cmd,
return -1; return -1;
} }
static void i2cdev_cleanup(void)
{
int res;
if (i2cdev_initialized >= 2) {
if ((res = i2c_del_driver(&i2cdev_driver))) {
printk(KERN_ERR "i2c-dev.o: Driver deregistration failed, "
"module not removed.\n");
}
i2cdev_initialized --;
}
if (i2cdev_initialized >= 1) {
#ifdef CONFIG_DEVFS_FS
devfs_unregister(devfs_handle);
#endif
if ((res = unregister_chrdev(I2C_MAJOR,"i2c"))) {
printk(KERN_ERR "i2c-dev.o: unable to release major %d for i2c bus\n",
I2C_MAJOR);
}
i2cdev_initialized --;
}
}
int __init i2c_dev_init(void) int __init i2c_dev_init(void)
{ {
int res; int res;
...@@ -517,50 +494,11 @@ int __init i2c_dev_init(void) ...@@ -517,50 +494,11 @@ int __init i2c_dev_init(void)
return 0; return 0;
} }
int i2cdev_cleanup(void)
{
int res;
if (i2cdev_initialized >= 2) {
if ((res = i2c_del_driver(&i2cdev_driver))) {
printk(KERN_ERR "i2c-dev.o: Driver deregistration failed, "
"module not removed.\n");
return res;
}
i2cdev_initialized --;
}
if (i2cdev_initialized >= 1) {
#ifdef CONFIG_DEVFS_FS
devfs_unregister(devfs_handle);
#endif
if ((res = unregister_chrdev(I2C_MAJOR,"i2c"))) {
printk(KERN_ERR "i2c-dev.o: unable to release major %d for i2c bus\n",
I2C_MAJOR);
return res;
}
i2cdev_initialized --;
}
return 0;
}
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
#ifdef MODULE
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Simon G. Vogl <simon@tk.uni-linz.ac.at>"); MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C /dev entries driver"); MODULE_DESCRIPTION("I2C /dev entries driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
int init_module(void) module_init(i2c_dev_init);
{ module_exit(i2cdev_cleanup);
return i2c_dev_init();
}
int cleanup_module(void)
{
return i2cdev_cleanup();
}
#endif /* def MODULE */
...@@ -54,8 +54,6 @@ static int i2c_sysctl_chips(ctl_table * table, int *name, int nlen, ...@@ -54,8 +54,6 @@ static int i2c_sysctl_chips(ctl_table * table, int *name, int nlen,
void *newval, size_t newlen, void *newval, size_t newlen,
void **context); void **context);
int __init sensors_init(void);
#define SENSORS_ENTRY_MAX 20 #define SENSORS_ENTRY_MAX 20
static struct ctl_table_header *i2c_entries[SENSORS_ENTRY_MAX]; static struct ctl_table_header *i2c_entries[SENSORS_ENTRY_MAX];
...@@ -815,35 +813,23 @@ int __init sensors_init(void) ...@@ -815,35 +813,23 @@ int __init sensors_init(void)
return 0; return 0;
} }
static void __exit i2c_cleanup(void)
{
if (i2c_initialized >= 1) {
unregister_sysctl_table(i2c_proc_header);
i2c_initialized--;
}
}
EXPORT_SYMBOL(i2c_deregister_entry); EXPORT_SYMBOL(i2c_deregister_entry);
EXPORT_SYMBOL(i2c_detect); EXPORT_SYMBOL(i2c_detect);
EXPORT_SYMBOL(i2c_proc_real); EXPORT_SYMBOL(i2c_proc_real);
EXPORT_SYMBOL(i2c_register_entry); EXPORT_SYMBOL(i2c_register_entry);
EXPORT_SYMBOL(i2c_sysctl_real); EXPORT_SYMBOL(i2c_sysctl_real);
#ifdef MODULE
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"); MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
MODULE_DESCRIPTION("i2c-proc driver"); MODULE_DESCRIPTION("i2c-proc driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
int i2c_cleanup(void) module_init(sensors_init);
{ module_exit(i2c_cleanup);
if (i2c_initialized >= 1) {
unregister_sysctl_table(i2c_proc_header);
i2c_initialized--;
}
return 0;
}
int init_module(void)
{
return sensors_init();
}
int cleanup_module(void)
{
return i2c_cleanup();
}
#endif /* MODULE */
...@@ -106,7 +106,7 @@ void __exit act200l_cleanup(void) ...@@ -106,7 +106,7 @@ void __exit act200l_cleanup(void)
static void act200l_open(dongle_t *self, struct qos_info *qos) static void act200l_open(dongle_t *self, struct qos_info *qos)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power on the dongle */ /* Power on the dongle */
self->set_dtr_rts(self->dev, TRUE, TRUE); self->set_dtr_rts(self->dev, TRUE, TRUE);
...@@ -120,7 +120,7 @@ static void act200l_open(dongle_t *self, struct qos_info *qos) ...@@ -120,7 +120,7 @@ static void act200l_open(dongle_t *self, struct qos_info *qos)
static void act200l_close(dongle_t *self) static void act200l_close(dongle_t *self)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power off the dongle */ /* Power off the dongle */
self->set_dtr_rts(self->dev, FALSE, FALSE); self->set_dtr_rts(self->dev, FALSE, FALSE);
...@@ -141,7 +141,7 @@ static int act200l_change_speed(struct irda_task *task) ...@@ -141,7 +141,7 @@ static int act200l_change_speed(struct irda_task *task)
__u8 control[3]; __u8 control[3];
int ret = 0; int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self->speed_task = task; self->speed_task = task;
...@@ -233,7 +233,7 @@ static int act200l_reset(struct irda_task *task) ...@@ -233,7 +233,7 @@ static int act200l_reset(struct irda_task *task)
}; };
int ret = 0; int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self->reset_task = task; self->reset_task = task;
......
This diff is collapsed.
...@@ -170,7 +170,7 @@ static inline void register_bank(int iobase, int bank) ...@@ -170,7 +170,7 @@ static inline void register_bank(int iobase, int bank)
static int __init smc_access(unsigned short cfg_base,unsigned char reg) static int __init smc_access(unsigned short cfg_base,unsigned char reg)
{ {
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
outb(reg, cfg_base); outb(reg, cfg_base);
...@@ -184,7 +184,7 @@ static const smc_chip_t * __init smc_probe(unsigned short cfg_base,u8 reg,const ...@@ -184,7 +184,7 @@ static const smc_chip_t * __init smc_probe(unsigned short cfg_base,u8 reg,const
{ {
u8 devid,xdevid,rev; u8 devid,xdevid,rev;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Leave configuration */ /* Leave configuration */
...@@ -263,7 +263,7 @@ static int __init smc_superio_flat(const smc_chip_t *chips, unsigned short cfg_b ...@@ -263,7 +263,7 @@ static int __init smc_superio_flat(const smc_chip_t *chips, unsigned short cfg_b
u8 mode; u8 mode;
int ret = -ENODEV; int ret = -ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (smc_probe(cfg_base,0xD,chips,type)==NULL) if (smc_probe(cfg_base,0xD,chips,type)==NULL)
return ret; return ret;
...@@ -307,7 +307,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_ ...@@ -307,7 +307,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_
unsigned short sir_io; unsigned short sir_io;
int ret = -ENODEV; int ret = -ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (smc_probe(cfg_base,0x20,chips,type)==NULL) if (smc_probe(cfg_base,0x20,chips,type)==NULL)
return ret; return ret;
...@@ -343,7 +343,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_ ...@@ -343,7 +343,7 @@ static int __init smc_superio_paged(const smc_chip_t *chips, unsigned short cfg_
static int __init smc_superio_fdc(unsigned short cfg_base) static int __init smc_superio_fdc(unsigned short cfg_base)
{ {
if (check_region(cfg_base, 2) < 0) { if (check_region(cfg_base, 2) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get cfg_base of 0x%03x\n", IRDA_DEBUG(0, "%s: can't get cfg_base of 0x%03x\n", __FUNCTION__ ,
cfg_base); cfg_base);
return -1; return -1;
} }
...@@ -358,7 +358,7 @@ static int __init smc_superio_lpc(unsigned short cfg_base) ...@@ -358,7 +358,7 @@ static int __init smc_superio_lpc(unsigned short cfg_base)
{ {
#if 0 #if 0
if (check_region(cfg_base, 2) < 0) { if (check_region(cfg_base, 2) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get cfg_base of 0x%03x\n", IRDA_DEBUG(0, "%s: can't get cfg_base of 0x%03x\n", __FUNCTION__ ,
cfg_base); cfg_base);
return -1; return -1;
} }
...@@ -380,7 +380,7 @@ int __init ircc_init(void) ...@@ -380,7 +380,7 @@ int __init ircc_init(void)
{ {
int ret=-ENODEV; int ret=-ENODEV;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
dev_count=0; dev_count=0;
...@@ -403,8 +403,8 @@ int __init ircc_init(void) ...@@ -403,8 +403,8 @@ int __init ircc_init(void)
/* Trys to open for all the SMC chipsets we know about */ /* Trys to open for all the SMC chipsets we know about */
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0,
" Try to open all known SMC chipsets\n"); "%s Try to open all known SMC chipsets\n", __FUNCTION__ );
if (!smc_superio_fdc(0x3f0)) if (!smc_superio_fdc(0x3f0))
ret=0; ret=0;
...@@ -434,16 +434,16 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base) ...@@ -434,16 +434,16 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
unsigned long flags; unsigned long flags;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
if (check_region(fir_base, CHIP_IO_EXTENT) < 0) { if (check_region(fir_base, CHIP_IO_EXTENT) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get fir_base of 0x%03x\n", IRDA_DEBUG(0, "%s: can't get fir_base of 0x%03x\n", __FUNCTION__ ,
fir_base); fir_base);
return -ENODEV; return -ENODEV;
} }
#if POSSIBLE_USED_BY_SERIAL_DRIVER #if POSSIBLE_USED_BY_SERIAL_DRIVER
if (check_region(sir_base, CHIP_IO_EXTENT) < 0) { if (check_region(sir_base, CHIP_IO_EXTENT) < 0) {
IRDA_DEBUG(0, __FUNCTION__ ": can't get sir_base of 0x%03x\n", IRDA_DEBUG(0, "%s: can't get sir_base of 0x%03x\n", __FUNCTION__ ,
sir_base); sir_base);
return -ENODEV; return -ENODEV;
} }
...@@ -461,8 +461,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base) ...@@ -461,8 +461,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
dma = config & 0x0f; dma = config & 0x0f;
if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) { if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) {
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0,
"(), addr 0x%04x - no device found!\n", fir_base); "%s(), addr 0x%04x - no device found!\n", __FUNCTION__ , fir_base);
return -ENODEV; return -ENODEV;
} }
MESSAGE("SMC IrDA Controller found\n IrCC version %d.%d, " MESSAGE("SMC IrDA Controller found\n IrCC version %d.%d, "
...@@ -470,8 +470,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base) ...@@ -470,8 +470,8 @@ static int __init ircc_open(unsigned int fir_base, unsigned int sir_base)
chip & 0x0f, version, fir_base, sir_base, dma, irq); chip & 0x0f, version, fir_base, sir_base, dma, irq);
if (dev_count>DIM(dev_self)) { if (dev_count>DIM(dev_self)) {
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0,
"(), to many devices!\n"); "%s(), to many devices!\n", __FUNCTION__ );
return -ENOMEM; return -ENOMEM;
} }
...@@ -610,7 +610,7 @@ static void ircc_change_speed(void *priv, u32 speed) ...@@ -610,7 +610,7 @@ static void ircc_change_speed(void *priv, u32 speed)
struct ircc_cb *self = (struct ircc_cb *) priv; struct ircc_cb *self = (struct ircc_cb *) priv;
struct net_device *dev; struct net_device *dev;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
...@@ -625,7 +625,7 @@ static void ircc_change_speed(void *priv, u32 speed) ...@@ -625,7 +625,7 @@ static void ircc_change_speed(void *priv, u32 speed)
switch (speed) { switch (speed) {
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown baud rate of %d\n", IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __FUNCTION__ ,
speed); speed);
/* FALLTHROUGH */ /* FALLTHROUGH */
case 9600: case 9600:
...@@ -641,19 +641,19 @@ static void ircc_change_speed(void *priv, u32 speed) ...@@ -641,19 +641,19 @@ static void ircc_change_speed(void *priv, u32 speed)
ir_mode = IRCC_CFGA_IRDA_HDLC; ir_mode = IRCC_CFGA_IRDA_HDLC;
ctrl = IRCC_CRC; ctrl = IRCC_CRC;
fast = 0; fast = 0;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n"); IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__ );
break; break;
case 1152000: case 1152000:
ir_mode = IRCC_CFGA_IRDA_HDLC; ir_mode = IRCC_CFGA_IRDA_HDLC;
ctrl = IRCC_1152 | IRCC_CRC; ctrl = IRCC_1152 | IRCC_CRC;
fast = 0; fast = 0;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n"); IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__ );
break; break;
case 4000000: case 4000000:
ir_mode = IRCC_CFGA_IRDA_4PPM; ir_mode = IRCC_CFGA_IRDA_4PPM;
ctrl = IRCC_CRC; ctrl = IRCC_CRC;
fast = IRCC_LCR_A_FAST; fast = IRCC_LCR_A_FAST;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n"); IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__ );
break; break;
} }
...@@ -683,8 +683,8 @@ static void ircc_change_speed(void *priv, u32 speed) ...@@ -683,8 +683,8 @@ static void ircc_change_speed(void *priv, u32 speed)
/* No need to lock, already locked - Jean II */ /* No need to lock, already locked - Jean II */
irport_start(self->irport); irport_start(self->irport);
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0,
"(), using irport to change speed to %d\n", speed); "%s(), using irport to change speed to %d\n", __FUNCTION__ , speed);
irport_change_speed(self->irport, speed); irport_change_speed(self->irport, speed);
} }
...@@ -792,7 +792,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs) ...@@ -792,7 +792,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs)
{ {
u8 ctrl; u8 ctrl;
IRDA_DEBUG(2, __FUNCTION__ "\n"); IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0 #if 0
/* Disable Rx */ /* Disable Rx */
register_bank(iobase, 0); register_bank(iobase, 0);
...@@ -842,7 +842,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs) ...@@ -842,7 +842,7 @@ static void ircc_dma_xmit(struct ircc_cb *self, int iobase, int bofs)
*/ */
static void ircc_dma_xmit_complete(struct ircc_cb *self, int iobase) static void ircc_dma_xmit_complete(struct ircc_cb *self, int iobase)
{ {
IRDA_DEBUG(2, __FUNCTION__ "\n"); IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0 #if 0
/* Disable Tx */ /* Disable Tx */
register_bank(iobase, 0); register_bank(iobase, 0);
...@@ -928,7 +928,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase) ...@@ -928,7 +928,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
struct sk_buff *skb; struct sk_buff *skb;
int len, msgcnt; int len, msgcnt;
IRDA_DEBUG(2, __FUNCTION__ "\n"); IRDA_DEBUG(2, "%s\n", __FUNCTION__ );
#if 0 #if 0
/* Disable Rx */ /* Disable Rx */
register_bank(iobase, 0); register_bank(iobase, 0);
...@@ -937,7 +937,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase) ...@@ -937,7 +937,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
register_bank(iobase, 0); register_bank(iobase, 0);
msgcnt = inb(iobase+IRCC_LCR_B) & 0x08; msgcnt = inb(iobase+IRCC_LCR_B) & 0x08;
IRDA_DEBUG(2, __FUNCTION__ ": dma count = %d\n", IRDA_DEBUG(2, "%s: dma count = %d\n", __FUNCTION__ ,
get_dma_residue(self->io->dma)); get_dma_residue(self->io->dma));
len = self->rx_buff.truesize - get_dma_residue(self->io->dma); len = self->rx_buff.truesize - get_dma_residue(self->io->dma);
...@@ -952,7 +952,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase) ...@@ -952,7 +952,7 @@ static void ircc_dma_receive_complete(struct ircc_cb *self, int iobase)
WARNING("%s(), bogus len=%d\n", __FUNCTION__, len); WARNING("%s(), bogus len=%d\n", __FUNCTION__, len);
return; return;
} }
IRDA_DEBUG(2, __FUNCTION__ ": msgcnt = %d, len=%d\n", msgcnt, len); IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __FUNCTION__ , msgcnt, len);
skb = dev_alloc_skb(len+1); skb = dev_alloc_skb(len+1);
if (!skb) { if (!skb) {
...@@ -1012,7 +1012,7 @@ static void ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1012,7 +1012,7 @@ static void ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/* Disable interrupts */ /* Disable interrupts */
outb(0, iobase+IRCC_IER); outb(0, iobase+IRCC_IER);
IRDA_DEBUG(2, __FUNCTION__ "(), iir = 0x%02x\n", iir); IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __FUNCTION__ , iir);
if (iir & IRCC_IIR_EOM) { if (iir & IRCC_IIR_EOM) {
if (self->io->direction == IO_RECV) if (self->io->direction == IO_RECV)
...@@ -1042,11 +1042,11 @@ static int ircc_is_receiving(struct ircc_cb *self) ...@@ -1042,11 +1042,11 @@ static int ircc_is_receiving(struct ircc_cb *self)
int status = FALSE; int status = FALSE;
/* int iobase; */ /* int iobase; */
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return FALSE;); ASSERT(self != NULL, return FALSE;);
IRDA_DEBUG(0, __FUNCTION__ ": dma count = %d\n", IRDA_DEBUG(0, "%s: dma count = %d\n", __FUNCTION__ ,
get_dma_residue(self->io->dma)); get_dma_residue(self->io->dma));
status = (self->rx_buff.state != OUTSIDE_FRAME); status = (self->rx_buff.state != OUTSIDE_FRAME);
...@@ -1067,7 +1067,7 @@ static int ircc_net_open(struct net_device *dev) ...@@ -1067,7 +1067,7 @@ static int ircc_net_open(struct net_device *dev)
struct ircc_cb *self; struct ircc_cb *self;
int iobase; int iobase;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;); ASSERT(dev != NULL, return -1;);
irport = (struct irport_cb *) dev->priv; irport = (struct irport_cb *) dev->priv;
...@@ -1180,7 +1180,7 @@ static int __exit ircc_close(struct ircc_cb *self) ...@@ -1180,7 +1180,7 @@ static int __exit ircc_close(struct ircc_cb *self)
{ {
int iobase; int iobase;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -1202,7 +1202,7 @@ static int __exit ircc_close(struct ircc_cb *self) ...@@ -1202,7 +1202,7 @@ static int __exit ircc_close(struct ircc_cb *self)
#endif #endif
/* Release the PORT that this driver is using */ /* Release the PORT that this driver is using */
IRDA_DEBUG(0, __FUNCTION__ "(), releasing 0x%03x\n", iobase); IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__ , iobase);
release_region(iobase, CHIP_IO_EXTENT); release_region(iobase, CHIP_IO_EXTENT);
...@@ -1226,7 +1226,7 @@ void __exit smc_cleanup(void) ...@@ -1226,7 +1226,7 @@ void __exit smc_cleanup(void)
{ {
int i; int i;
IRDA_DEBUG(0, __FUNCTION__ "\n"); IRDA_DEBUG(0, "%s\n", __FUNCTION__ );
for (i=0; i < 2; i++) { for (i=0; i < 2; i++) {
if (dev_self[i]) if (dev_self[i])
......
...@@ -66,7 +66,7 @@ void __exit tekram_cleanup(void) ...@@ -66,7 +66,7 @@ void __exit tekram_cleanup(void)
static void tekram_open(dongle_t *self, struct qos_info *qos) static void tekram_open(dongle_t *self, struct qos_info *qos)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */ qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */
...@@ -77,7 +77,7 @@ static void tekram_open(dongle_t *self, struct qos_info *qos) ...@@ -77,7 +77,7 @@ static void tekram_open(dongle_t *self, struct qos_info *qos)
static void tekram_close(dongle_t *self) static void tekram_close(dongle_t *self)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Power off dongle */ /* Power off dongle */
self->set_dtr_rts(self->dev, FALSE, FALSE); self->set_dtr_rts(self->dev, FALSE, FALSE);
...@@ -113,12 +113,12 @@ static int tekram_change_speed(struct irda_task *task) ...@@ -113,12 +113,12 @@ static int tekram_change_speed(struct irda_task *task)
__u8 byte; __u8 byte;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(task != NULL, return -1;); ASSERT(task != NULL, return -1;);
if (self->speed_task && self->speed_task != task) { if (self->speed_task && self->speed_task != task) {
IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n"); IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
return MSECS_TO_JIFFIES(10); return MSECS_TO_JIFFIES(10);
} else } else
self->speed_task = task; self->speed_task = task;
...@@ -214,12 +214,12 @@ int tekram_reset(struct irda_task *task) ...@@ -214,12 +214,12 @@ int tekram_reset(struct irda_task *task)
dongle_t *self = (dongle_t *) task->instance; dongle_t *self = (dongle_t *) task->instance;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(task != NULL, return -1;); ASSERT(task != NULL, return -1;);
if (self->reset_task && self->reset_task != task) { if (self->reset_task && self->reset_task != task) {
IRDA_DEBUG(0, __FUNCTION__ "(), busy!\n"); IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
return MSECS_TO_JIFFIES(10); return MSECS_TO_JIFFIES(10);
} else } else
self->reset_task = task; self->reset_task = task;
......
...@@ -92,7 +92,7 @@ static int max_baud = 4000000; ...@@ -92,7 +92,7 @@ static int max_baud = 4000000;
static void static void
toshoboe_stopchip (struct toshoboe_cb *self) toshoboe_stopchip (struct toshoboe_cb *self)
{ {
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
outb_p (0x0e, OBOE_REG_11); outb_p (0x0e, OBOE_REG_11);
...@@ -113,7 +113,7 @@ static void ...@@ -113,7 +113,7 @@ static void
toshoboe_setbaud (struct toshoboe_cb *self, int baud) toshoboe_setbaud (struct toshoboe_cb *self, int baud)
{ {
unsigned long flags; unsigned long flags;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
printk (KERN_WARNING "ToshOboe: setting baud to %d\n", baud); printk (KERN_WARNING "ToshOboe: setting baud to %d\n", baud);
...@@ -183,7 +183,7 @@ toshoboe_startchip (struct toshoboe_cb *self) ...@@ -183,7 +183,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
{ {
__u32 physaddr; __u32 physaddr;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
outb_p (0, OBOE_LOCK); outb_p (0, OBOE_LOCK);
...@@ -212,7 +212,7 @@ toshoboe_startchip (struct toshoboe_cb *self) ...@@ -212,7 +212,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
static void static void
toshoboe_enablebm (struct toshoboe_cb *self) toshoboe_enablebm (struct toshoboe_cb *self)
{ {
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
pci_set_master (self->pdev); pci_set_master (self->pdev);
} }
...@@ -221,7 +221,7 @@ static void ...@@ -221,7 +221,7 @@ static void
toshoboe_disablebm (struct toshoboe_cb *self) toshoboe_disablebm (struct toshoboe_cb *self)
{ {
__u8 command; __u8 command;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
pci_read_config_byte (self->pdev, PCI_COMMAND, &command); pci_read_config_byte (self->pdev, PCI_COMMAND, &command);
command &= ~PCI_COMMAND_MASTER; command &= ~PCI_COMMAND_MASTER;
...@@ -236,7 +236,7 @@ toshoboe_initbuffs (struct toshoboe_cb *self) ...@@ -236,7 +236,7 @@ toshoboe_initbuffs (struct toshoboe_cb *self)
int i; int i;
unsigned long flags; unsigned long flags;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
save_flags (flags); save_flags (flags);
cli (); cli ();
...@@ -363,7 +363,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs) ...@@ -363,7 +363,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
return; return;
} }
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
irqstat = inb_p (OBOE_ISR); irqstat = inb_p (OBOE_ISR);
...@@ -463,7 +463,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs) ...@@ -463,7 +463,7 @@ toshoboe_interrupt (int irq, void *dev_id, struct pt_regs *regs)
static int static int
toshoboe_net_init (struct net_device *dev) toshoboe_net_init (struct net_device *dev)
{ {
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
/* Setup to be a normal IrDA network device driver */ /* Setup to be a normal IrDA network device driver */
irda_device_setup (dev); irda_device_setup (dev);
...@@ -512,7 +512,7 @@ toshoboe_net_open (struct net_device *dev) ...@@ -512,7 +512,7 @@ toshoboe_net_open (struct net_device *dev)
struct toshoboe_cb *self; struct toshoboe_cb *self;
char hwname[32]; char hwname[32];
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (dev != NULL, return -1; ASSERT (dev != NULL, return -1;
); );
...@@ -559,7 +559,7 @@ toshoboe_net_close (struct net_device *dev) ...@@ -559,7 +559,7 @@ toshoboe_net_close (struct net_device *dev)
{ {
struct toshoboe_cb *self; struct toshoboe_cb *self;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (dev != NULL, return -1; ASSERT (dev != NULL, return -1;
); );
...@@ -608,7 +608,7 @@ static int toshoboe_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -608,7 +608,7 @@ static int toshoboe_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
IRDA_DEBUG(2, __FUNCTION__ "(), %s, (cmd=0x%X)\n", dev->name, cmd); IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev->name, cmd);
/* Disable interrupts & save flags */ /* Disable interrupts & save flags */
save_flags(flags); save_flags(flags);
...@@ -654,7 +654,7 @@ toshoboe_remove (struct pci_dev *pci_dev) ...@@ -654,7 +654,7 @@ toshoboe_remove (struct pci_dev *pci_dev)
int i; int i;
struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev); struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
ASSERT (self != NULL, return; ASSERT (self != NULL, return;
); );
...@@ -704,7 +704,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid) ...@@ -704,7 +704,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
int ok = 0; int ok = 0;
int err; int err;
IRDA_DEBUG (4, __FUNCTION__ "()\n"); IRDA_DEBUG (4, "%s()\n", __FUNCTION__ );
if ((err=pci_enable_device(pci_dev))) if ((err=pci_enable_device(pci_dev)))
return err; return err;
...@@ -733,7 +733,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid) ...@@ -733,7 +733,7 @@ toshoboe_probe (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
/* Lock the port that we need */ /* Lock the port that we need */
if (NULL==request_region (self->io.sir_base, self->io.sir_ext, driver_name)) if (NULL==request_region (self->io.sir_base, self->io.sir_ext, driver_name))
{ {
IRDA_DEBUG (0, __FUNCTION__ "(), can't get iobase of 0x%03x\n", IRDA_DEBUG (0, "%s(), can't get iobase of 0x%03x\n", __FUNCTION__ ,
self->io.sir_base); self->io.sir_base);
err = -EBUSY; err = -EBUSY;
......
...@@ -116,7 +116,7 @@ int __init w83977af_init(void) ...@@ -116,7 +116,7 @@ int __init w83977af_init(void)
{ {
int i; int i;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
for (i=0; (io[i] < 2000) && (i < 4); i++) { for (i=0; (io[i] < 2000) && (i < 4); i++) {
int ioaddr = io[i]; int ioaddr = io[i];
...@@ -138,7 +138,7 @@ void __exit w83977af_cleanup(void) ...@@ -138,7 +138,7 @@ void __exit w83977af_cleanup(void)
{ {
int i; int i;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
for (i=0; i < 4; i++) { for (i=0; i < 4; i++) {
if (dev_self[i]) if (dev_self[i])
...@@ -160,7 +160,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq, ...@@ -160,7 +160,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
void *ret; void *ret;
int err; int err;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (w83977af_probe(iobase, irq, dma) == -1) if (w83977af_probe(iobase, irq, dma) == -1)
return -1; return -1;
...@@ -190,8 +190,8 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq, ...@@ -190,8 +190,8 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
/* Lock the port that we need */ /* Lock the port that we need */
ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name); ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name);
if (!ret) { if (!ret) {
IRDA_DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n", IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",
self->io.fir_base); __FUNCTION__ , self->io.fir_base);
/* w83977af_cleanup( self); */ /* w83977af_cleanup( self); */
return -ENODEV; return -ENODEV;
} }
...@@ -273,7 +273,7 @@ static int w83977af_close(struct w83977af_ir *self) ...@@ -273,7 +273,7 @@ static int w83977af_close(struct w83977af_ir *self)
{ {
int iobase; int iobase;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
iobase = self->io.fir_base; iobase = self->io.fir_base;
...@@ -297,8 +297,8 @@ static int w83977af_close(struct w83977af_ir *self) ...@@ -297,8 +297,8 @@ static int w83977af_close(struct w83977af_ir *self)
} }
/* Release the PORT that this driver is using */ /* Release the PORT that this driver is using */
IRDA_DEBUG(0 , __FUNCTION__ "(), Releasing Region %03x\n", IRDA_DEBUG(0 , "%s(), Releasing Region %03x\n",
self->io.fir_base); __FUNCTION__ , self->io.fir_base);
release_region(self->io.fir_base, self->io.fir_ext); release_region(self->io.fir_base, self->io.fir_ext);
if (self->tx_buff.head) if (self->tx_buff.head)
...@@ -318,7 +318,7 @@ int w83977af_probe( int iobase, int irq, int dma) ...@@ -318,7 +318,7 @@ int w83977af_probe( int iobase, int irq, int dma)
int i; int i;
for (i=0; i < 2; i++) { for (i=0; i < 2; i++) {
IRDA_DEBUG( 0, __FUNCTION__ "()\n"); IRDA_DEBUG( 0, "%s()\n", __FUNCTION__ );
#ifdef CONFIG_USE_W977_PNP #ifdef CONFIG_USE_W977_PNP
/* Enter PnP configuration mode */ /* Enter PnP configuration mode */
w977_efm_enter(efbase[i]); w977_efm_enter(efbase[i]);
...@@ -405,7 +405,7 @@ int w83977af_probe( int iobase, int irq, int dma) ...@@ -405,7 +405,7 @@ int w83977af_probe( int iobase, int irq, int dma)
return 0; return 0;
} else { } else {
/* Try next extented function register address */ /* Try next extented function register address */
IRDA_DEBUG( 0, __FUNCTION__ "(), Wrong chip version"); IRDA_DEBUG( 0, "%s(), Wrong chip version", __FUNCTION__ );
} }
} }
return -1; return -1;
...@@ -441,19 +441,19 @@ void w83977af_change_speed(struct w83977af_ir *self, __u32 speed) ...@@ -441,19 +441,19 @@ void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
case 115200: outb(0x01, iobase+ABLL); break; case 115200: outb(0x01, iobase+ABLL); break;
case 576000: case 576000:
ir_mode = HCR_MIR_576; ir_mode = HCR_MIR_576;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n"); IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__ );
break; break;
case 1152000: case 1152000:
ir_mode = HCR_MIR_1152; ir_mode = HCR_MIR_1152;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n"); IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__ );
break; break;
case 4000000: case 4000000:
ir_mode = HCR_FIR; ir_mode = HCR_FIR;
IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n"); IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__ );
break; break;
default: default:
ir_mode = HCR_FIR; ir_mode = HCR_FIR;
IRDA_DEBUG(0, __FUNCTION__ "(), unknown baud rate of %d\n", speed); IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __FUNCTION__ , speed);
break; break;
} }
...@@ -503,7 +503,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -503,7 +503,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
iobase = self->io.fir_base; iobase = self->io.fir_base;
IRDA_DEBUG(4, __FUNCTION__ "(%ld), skb->len=%d\n", jiffies, IRDA_DEBUG(4, "%s(%ld), skb->len=%d\n", __FUNCTION__ , jiffies,
(int) skb->len); (int) skb->len);
/* Lock transmit buffer */ /* Lock transmit buffer */
...@@ -550,7 +550,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -550,7 +550,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
outb(ICR_ETMRI, iobase+ICR); outb(ICR_ETMRI, iobase+ICR);
} else { } else {
#endif #endif
IRDA_DEBUG(4,__FUNCTION__ "(%ld), mtt=%d\n", jiffies, mtt); IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __FUNCTION__ , jiffies, mtt);
if (mtt) if (mtt)
udelay(mtt); udelay(mtt);
...@@ -591,7 +591,7 @@ static void w83977af_dma_write(struct w83977af_ir *self, int iobase) ...@@ -591,7 +591,7 @@ static void w83977af_dma_write(struct w83977af_ir *self, int iobase)
unsigned long flags; unsigned long flags;
__u8 hcr; __u8 hcr;
#endif #endif
IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", self->tx_buff.len); IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__ , self->tx_buff.len);
/* Save current set */ /* Save current set */
set = inb(iobase+SSR); set = inb(iobase+SSR);
...@@ -643,19 +643,19 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size) ...@@ -643,19 +643,19 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
int actual = 0; int actual = 0;
__u8 set; __u8 set;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
/* Save current bank */ /* Save current bank */
set = inb(iobase+SSR); set = inb(iobase+SSR);
switch_bank(iobase, SET0); switch_bank(iobase, SET0);
if (!(inb_p(iobase+USR) & USR_TSRE)) { if (!(inb_p(iobase+USR) & USR_TSRE)) {
IRDA_DEBUG(4, __FUNCTION__ IRDA_DEBUG(4,
"(), warning, FIFO not empty yet!\n"); "%s(), warning, FIFO not empty yet!\n", __FUNCTION__ );
fifo_size -= 17; fifo_size -= 17;
IRDA_DEBUG(4, __FUNCTION__ "%d bytes left in tx fifo\n", IRDA_DEBUG(4, "%s(), %d bytes left in tx fifo\n",
fifo_size); __FUNCTION__ , fifo_size);
} }
/* Fill FIFO with current frame */ /* Fill FIFO with current frame */
...@@ -664,8 +664,8 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size) ...@@ -664,8 +664,8 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
outb(buf[actual++], iobase+TBR); outb(buf[actual++], iobase+TBR);
} }
IRDA_DEBUG(4, __FUNCTION__ "(), fifo_size %d ; %d sent of %d\n", IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n",
fifo_size, actual, len); __FUNCTION__ , fifo_size, actual, len);
/* Restore bank */ /* Restore bank */
outb(set, iobase+SSR); outb(set, iobase+SSR);
...@@ -685,7 +685,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self) ...@@ -685,7 +685,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self)
int iobase; int iobase;
__u8 set; __u8 set;
IRDA_DEBUG(4, __FUNCTION__ "(%ld)\n", jiffies); IRDA_DEBUG(4, "%s(%ld)\n", __FUNCTION__ , jiffies);
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
...@@ -700,7 +700,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self) ...@@ -700,7 +700,7 @@ void w83977af_dma_xmit_complete(struct w83977af_ir *self)
/* Check for underrrun! */ /* Check for underrrun! */
if (inb(iobase+AUDR) & AUDR_UNDR) { if (inb(iobase+AUDR) & AUDR_UNDR) {
IRDA_DEBUG(0, __FUNCTION__ "(), Transmit underrun!\n"); IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __FUNCTION__ );
self->stats.tx_errors++; self->stats.tx_errors++;
self->stats.tx_fifo_errors++; self->stats.tx_fifo_errors++;
...@@ -741,7 +741,7 @@ int w83977af_dma_receive(struct w83977af_ir *self) ...@@ -741,7 +741,7 @@ int w83977af_dma_receive(struct w83977af_ir *self)
#endif #endif
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
IRDA_DEBUG(4, __FUNCTION__ "\n"); IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
iobase= self->io.fir_base; iobase= self->io.fir_base;
...@@ -812,7 +812,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self) ...@@ -812,7 +812,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self)
__u8 set; __u8 set;
__u8 status; __u8 status;
IRDA_DEBUG(4, __FUNCTION__ "\n"); IRDA_DEBUG(4, "%s\n", __FUNCTION__ );
st_fifo = &self->st_fifo; st_fifo = &self->st_fifo;
...@@ -939,7 +939,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self) ...@@ -939,7 +939,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self)
__u8 byte = 0x00; __u8 byte = 0x00;
int iobase; int iobase;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
...@@ -966,7 +966,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr) ...@@ -966,7 +966,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
__u8 set; __u8 set;
int iobase; int iobase;
IRDA_DEBUG(4, __FUNCTION__ "(), isr=%#x\n", isr); IRDA_DEBUG(4, "%s(), isr=%#x\n", __FUNCTION__ , isr);
iobase = self->io.fir_base; iobase = self->io.fir_base;
/* Transmit FIFO low on data */ /* Transmit FIFO low on data */
...@@ -1002,8 +1002,8 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr) ...@@ -1002,8 +1002,8 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
if (isr & ISR_TXEMP_I) { if (isr & ISR_TXEMP_I) {
/* Check if we need to change the speed? */ /* Check if we need to change the speed? */
if (self->new_speed) { if (self->new_speed) {
IRDA_DEBUG(2, __FUNCTION__ IRDA_DEBUG(2,
"(), Changing speed!\n"); "%s(), Changing speed!\n", __FUNCTION__ );
w83977af_change_speed(self, self->new_speed); w83977af_change_speed(self, self->new_speed);
self->new_speed = 0; self->new_speed = 0;
} }
...@@ -1185,7 +1185,7 @@ static int w83977af_is_receiving(struct w83977af_ir *self) ...@@ -1185,7 +1185,7 @@ static int w83977af_is_receiving(struct w83977af_ir *self)
*/ */
static int w83977af_net_init(struct net_device *dev) static int w83977af_net_init(struct net_device *dev)
{ {
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Set up to be a normal IrDA network device driver */ /* Set up to be a normal IrDA network device driver */
irda_device_setup(dev); irda_device_setup(dev);
...@@ -1209,7 +1209,7 @@ static int w83977af_net_open(struct net_device *dev) ...@@ -1209,7 +1209,7 @@ static int w83977af_net_open(struct net_device *dev)
char hwname[32]; char hwname[32];
__u8 set; __u8 set;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;); ASSERT(dev != NULL, return -1;);
self = (struct w83977af_ir *) dev->priv; self = (struct w83977af_ir *) dev->priv;
...@@ -1274,7 +1274,7 @@ static int w83977af_net_close(struct net_device *dev) ...@@ -1274,7 +1274,7 @@ static int w83977af_net_close(struct net_device *dev)
int iobase; int iobase;
__u8 set; __u8 set;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;); ASSERT(dev != NULL, return -1;);
...@@ -1331,7 +1331,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1331,7 +1331,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
IRDA_DEBUG(2, __FUNCTION__ "(), %s, (cmd=0x%X)\n", dev->name, cmd); IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__ , dev->name, cmd);
spin_lock_irqsave(&self->lock, flags); spin_lock_irqsave(&self->lock, flags);
......
...@@ -6,6 +6,8 @@ typedef int (elevator_merge_fn) (request_queue_t *, struct request **, ...@@ -6,6 +6,8 @@ typedef int (elevator_merge_fn) (request_queue_t *, struct request **,
typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struct request *); typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struct request *);
typedef void (elevator_merged_fn) (request_queue_t *, struct request *);
typedef struct request *(elevator_next_req_fn) (request_queue_t *); typedef struct request *(elevator_next_req_fn) (request_queue_t *);
typedef void (elevator_add_req_fn) (request_queue_t *, struct request *, struct list_head *); typedef void (elevator_add_req_fn) (request_queue_t *, struct request *, struct list_head *);
...@@ -19,6 +21,7 @@ typedef void (elevator_exit_fn) (request_queue_t *, elevator_t *); ...@@ -19,6 +21,7 @@ typedef void (elevator_exit_fn) (request_queue_t *, elevator_t *);
struct elevator_s struct elevator_s
{ {
elevator_merge_fn *elevator_merge_fn; elevator_merge_fn *elevator_merge_fn;
elevator_merged_fn *elevator_merged_fn;
elevator_merge_req_fn *elevator_merge_req_fn; elevator_merge_req_fn *elevator_merge_req_fn;
elevator_next_req_fn *elevator_next_req_fn; elevator_next_req_fn *elevator_next_req_fn;
...@@ -42,6 +45,7 @@ extern void __elv_add_request(request_queue_t *, struct request *, ...@@ -42,6 +45,7 @@ extern void __elv_add_request(request_queue_t *, struct request *,
extern int elv_merge(request_queue_t *, struct request **, struct bio *); extern int elv_merge(request_queue_t *, struct request **, struct bio *);
extern void elv_merge_requests(request_queue_t *, struct request *, extern void elv_merge_requests(request_queue_t *, struct request *,
struct request *); struct request *);
extern void elv_merged_request(request_queue_t *, struct request *);
extern void elv_remove_request(request_queue_t *, struct request *); extern void elv_remove_request(request_queue_t *, struct request *);
extern int elv_queue_empty(request_queue_t *); extern int elv_queue_empty(request_queue_t *);
extern inline struct list_head *elv_get_sort_head(request_queue_t *, struct request *); extern inline struct list_head *elv_get_sort_head(request_queue_t *, struct request *);
......
...@@ -477,13 +477,15 @@ void wake_up_forked_process(task_t * p) ...@@ -477,13 +477,15 @@ void wake_up_forked_process(task_t * p)
*/ */
void sched_exit(task_t * p) void sched_exit(task_t * p)
{ {
local_irq_disable(); unsigned long flags;
local_irq_save(flags);
if (p->first_time_slice) { if (p->first_time_slice) {
p->parent->time_slice += p->time_slice; p->parent->time_slice += p->time_slice;
if (unlikely(p->parent->time_slice > MAX_TIMESLICE)) if (unlikely(p->parent->time_slice > MAX_TIMESLICE))
p->parent->time_slice = MAX_TIMESLICE; p->parent->time_slice = MAX_TIMESLICE;
} }
local_irq_enable(); local_irq_restore(flags);
/* /*
* If the child was a (relative-) CPU hog then decrease * If the child was a (relative-) CPU hog then decrease
* the sleep_avg of the parent as well. * the sleep_avg of the parent as well.
......
...@@ -1086,6 +1086,7 @@ kill_proc(pid_t pid, int sig, int priv) ...@@ -1086,6 +1086,7 @@ kill_proc(pid_t pid, int sig, int priv)
*/ */
static inline void wake_up_parent(struct task_struct *p) static inline void wake_up_parent(struct task_struct *p)
{ {
unsigned long flags;
struct task_struct *parent = p->parent, *tsk = parent; struct task_struct *parent = p->parent, *tsk = parent;
/* /*
...@@ -1095,14 +1096,14 @@ static inline void wake_up_parent(struct task_struct *p) ...@@ -1095,14 +1096,14 @@ static inline void wake_up_parent(struct task_struct *p)
wake_up_interruptible(&tsk->wait_chldexit); wake_up_interruptible(&tsk->wait_chldexit);
return; return;
} }
spin_lock_irq(&parent->sig->siglock); spin_lock_irqsave(&parent->sig->siglock, flags);
do { do {
wake_up_interruptible(&tsk->wait_chldexit); wake_up_interruptible(&tsk->wait_chldexit);
tsk = next_thread(tsk); tsk = next_thread(tsk);
if (tsk->sig != parent->sig) if (tsk->sig != parent->sig)
BUG(); BUG();
} while (tsk != parent); } while (tsk != parent);
spin_unlock_irq(&parent->sig->siglock); spin_unlock_irqrestore(&parent->sig->siglock, flags);
} }
/* /*
......
This diff is collapsed.
...@@ -108,7 +108,7 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log) ...@@ -108,7 +108,7 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log)
{ {
discovery_t *discovery; discovery_t *discovery;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/* /*
* If log is missing this means that IrLAP was unable to perform the * If log is missing this means that IrLAP was unable to perform the
...@@ -150,7 +150,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force) ...@@ -150,7 +150,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
discovery_t *discovery, *curr; discovery_t *discovery, *curr;
unsigned long flags; unsigned long flags;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
spin_lock_irqsave(&log->hb_spinlock, flags); spin_lock_irqsave(&log->hb_spinlock, flags);
......
...@@ -78,7 +78,7 @@ int __init ircomm_init(void) ...@@ -78,7 +78,7 @@ int __init ircomm_init(void)
void __exit ircomm_cleanup(void) void __exit ircomm_cleanup(void)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
hashbin_delete(ircomm, (FREE_FUNC) __ircomm_close); hashbin_delete(ircomm, (FREE_FUNC) __ircomm_close);
...@@ -98,7 +98,7 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line) ...@@ -98,7 +98,7 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line)
struct ircomm_cb *self = NULL; struct ircomm_cb *self = NULL;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__ "(), service_type=0x%02x\n", IRDA_DEBUG(2, "%s(), service_type=0x%02x\n", __FUNCTION__ ,
service_type); service_type);
ASSERT(ircomm != NULL, return NULL;); ASSERT(ircomm != NULL, return NULL;);
...@@ -142,7 +142,7 @@ EXPORT_SYMBOL(ircomm_open); ...@@ -142,7 +142,7 @@ EXPORT_SYMBOL(ircomm_open);
*/ */
static int __ircomm_close(struct ircomm_cb *self) static int __ircomm_close(struct ircomm_cb *self)
{ {
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Disconnect link if any */ /* Disconnect link if any */
ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, NULL, NULL); ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, NULL, NULL);
...@@ -178,7 +178,7 @@ int ircomm_close(struct ircomm_cb *self) ...@@ -178,7 +178,7 @@ int ircomm_close(struct ircomm_cb *self)
ASSERT(self != NULL, return -EIO;); ASSERT(self != NULL, return -EIO;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;); ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;);
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
entry = hashbin_remove(ircomm, self->line, NULL); entry = hashbin_remove(ircomm, self->line, NULL);
...@@ -203,7 +203,7 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel, ...@@ -203,7 +203,7 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel,
struct ircomm_info info; struct ircomm_info info;
int ret; int ret;
IRDA_DEBUG(2 , __FUNCTION__"()\n"); IRDA_DEBUG(2 , "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -232,7 +232,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -232,7 +232,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
{ {
int clen = 0; int clen = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Check if the packet contains data on the control channel */ /* Check if the packet contains data on the control channel */
if (skb->len > 0) if (skb->len > 0)
...@@ -248,7 +248,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -248,7 +248,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
info->qos, info->max_data_size, info->qos, info->max_data_size,
info->max_header_size, skb); info->max_header_size, skb);
else { else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n"); IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -266,7 +266,7 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata) ...@@ -266,7 +266,7 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata)
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = ircomm_do_event(self, IRCOMM_CONNECT_RESPONSE, userdata, NULL); ret = ircomm_do_event(self, IRCOMM_CONNECT_RESPONSE, userdata, NULL);
...@@ -284,7 +284,7 @@ EXPORT_SYMBOL(ircomm_connect_response); ...@@ -284,7 +284,7 @@ EXPORT_SYMBOL(ircomm_connect_response);
void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb, void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info) struct ircomm_info *info)
{ {
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
if (self->notify.connect_confirm ) if (self->notify.connect_confirm )
self->notify.connect_confirm(self->notify.instance, self->notify.connect_confirm(self->notify.instance,
...@@ -292,7 +292,7 @@ void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -292,7 +292,7 @@ void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb,
info->max_data_size, info->max_data_size,
info->max_header_size, skb); info->max_header_size, skb);
else { else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n"); IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -307,7 +307,7 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -307,7 +307,7 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb)
{ {
int ret; int ret;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -EFAULT;); ASSERT(self != NULL, return -EFAULT;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
...@@ -328,14 +328,14 @@ EXPORT_SYMBOL(ircomm_data_request); ...@@ -328,14 +328,14 @@ EXPORT_SYMBOL(ircomm_data_request);
*/ */
void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb) void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(skb->len > 0, return;); ASSERT(skb->len > 0, return;);
if (self->notify.data_indication) if (self->notify.data_indication)
self->notify.data_indication(self->notify.instance, self, skb); self->notify.data_indication(self->notify.instance, self, skb);
else { else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n"); IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -368,8 +368,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -368,8 +368,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb)
if (skb->len) if (skb->len)
ircomm_data_indication(self, skb); ircomm_data_indication(self, skb);
else { else {
IRDA_DEBUG(4, __FUNCTION__ IRDA_DEBUG(4,
"(), data was control info only!\n"); "%s(), data was control info only!\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -384,7 +384,7 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -384,7 +384,7 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb)
{ {
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -EFAULT;); ASSERT(self != NULL, return -EFAULT;);
ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
...@@ -408,7 +408,7 @@ static void ircomm_control_indication(struct ircomm_cb *self, ...@@ -408,7 +408,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
{ {
struct sk_buff *ctrl_skb; struct sk_buff *ctrl_skb;
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ctrl_skb = skb_clone(skb, GFP_ATOMIC); ctrl_skb = skb_clone(skb, GFP_ATOMIC);
if (!ctrl_skb) if (!ctrl_skb)
...@@ -422,7 +422,7 @@ static void ircomm_control_indication(struct ircomm_cb *self, ...@@ -422,7 +422,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
self->notify.udata_indication(self->notify.instance, self, self->notify.udata_indication(self->notify.instance, self,
ctrl_skb); ctrl_skb);
else { else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n"); IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -438,7 +438,7 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata) ...@@ -438,7 +438,7 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata)
struct ircomm_info info; struct ircomm_info info;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(ircomm_disconnect_request); ...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(ircomm_disconnect_request);
void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info) struct ircomm_info *info)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(info != NULL, return;); ASSERT(info != NULL, return;);
...@@ -467,7 +467,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -467,7 +467,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
self->notify.disconnect_indication(self->notify.instance, self, self->notify.disconnect_indication(self->notify.instance, self,
info->reason, skb); info->reason, skb);
} else { } else {
IRDA_DEBUG(0, __FUNCTION__ "(), missing handler\n"); IRDA_DEBUG(0, "%s(), missing handler\n", __FUNCTION__ );
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} }
...@@ -480,7 +480,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -480,7 +480,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
*/ */
void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow) void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
...@@ -107,7 +107,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -107,7 +107,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_connect_indication(self, skb, info); ircomm_connect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(4, __FUNCTION__"(), unknown event: %s\n", IRDA_DEBUG(4, "%s(), unknown event: %s\n", __FUNCTION__ ,
ircomm_event[event]); ircomm_event[event]);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -139,7 +139,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -139,7 +139,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info); ircomm_disconnect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__"(), unknown event: %s\n", IRDA_DEBUG(0, "%s(), unknown event: %s\n", __FUNCTION__ ,
ircomm_event[event]); ircomm_event[event]);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -174,7 +174,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -174,7 +174,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info); ircomm_disconnect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n", IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
ircomm_event[event]); ircomm_event[event]);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -218,7 +218,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -218,7 +218,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
ret = self->issue.disconnect_request(self, skb, info); ret = self->issue.disconnect_request(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n", IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
ircomm_event[event]); ircomm_event[event]);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -236,7 +236,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -236,7 +236,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
struct sk_buff *skb, struct ircomm_info *info) struct sk_buff *skb, struct ircomm_info *info)
{ {
IRDA_DEBUG(4, __FUNCTION__": state=%s, event=%s\n", IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ ,
ircomm_state[self->state], ircomm_event[event]); ircomm_state[self->state], ircomm_event[event]);
return (*state[self->state])(self, event, skb, info); return (*state[self->state])(self, event, skb, info);
...@@ -252,6 +252,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state) ...@@ -252,6 +252,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state)
{ {
self->state = state; self->state = state;
IRDA_DEBUG(4, __FUNCTION__": next state=%s, service type=%d\n", IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ ,
ircomm_state[self->state], self->service_type); ircomm_state[self->state], self->service_type);
} }
...@@ -50,7 +50,7 @@ int ircomm_open_lsap(struct ircomm_cb *self) ...@@ -50,7 +50,7 @@ int ircomm_open_lsap(struct ircomm_cb *self)
{ {
notify_t notify; notify_t notify;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Register callbacks */ /* Register callbacks */
irda_notify_init(&notify); irda_notify_init(&notify);
...@@ -63,7 +63,7 @@ int ircomm_open_lsap(struct ircomm_cb *self) ...@@ -63,7 +63,7 @@ int ircomm_open_lsap(struct ircomm_cb *self)
self->lsap = irlmp_open_lsap(LSAP_ANY, &notify, 0); self->lsap = irlmp_open_lsap(LSAP_ANY, &notify, 0);
if (!self->lsap) { if (!self->lsap) {
IRDA_DEBUG(0,__FUNCTION__"failed to allocate tsap\n"); IRDA_DEBUG(0,"%sfailed to allocate tsap\n", __FUNCTION__ );
return -1; return -1;
} }
self->slsap_sel = self->lsap->slsap_sel; self->slsap_sel = self->lsap->slsap_sel;
...@@ -91,7 +91,7 @@ int ircomm_lmp_connect_request(struct ircomm_cb *self, ...@@ -91,7 +91,7 @@ int ircomm_lmp_connect_request(struct ircomm_cb *self,
{ {
int ret = 0; int ret = 0;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ret = irlmp_connect_request(self->lsap, info->dlsap_sel, ret = irlmp_connect_request(self->lsap, info->dlsap_sel,
info->saddr, info->daddr, NULL, userdata); info->saddr, info->daddr, NULL, userdata);
...@@ -109,7 +109,7 @@ int ircomm_lmp_connect_response(struct ircomm_cb *self, struct sk_buff *userdata ...@@ -109,7 +109,7 @@ int ircomm_lmp_connect_response(struct ircomm_cb *self, struct sk_buff *userdata
struct sk_buff *skb; struct sk_buff *skb;
int ret; int ret;
IRDA_DEBUG(0, __FUNCTION__"()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Any userdata supplied? */ /* Any userdata supplied? */
if (userdata == NULL) { if (userdata == NULL) {
...@@ -140,7 +140,7 @@ int ircomm_lmp_disconnect_request(struct ircomm_cb *self, ...@@ -140,7 +140,7 @@ int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
struct sk_buff *skb; struct sk_buff *skb;
int ret; int ret;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (!userdata) { if (!userdata) {
skb = dev_alloc_skb(64); skb = dev_alloc_skb(64);
...@@ -173,13 +173,13 @@ void ircomm_lmp_flow_control(struct sk_buff *skb) ...@@ -173,13 +173,13 @@ void ircomm_lmp_flow_control(struct sk_buff *skb)
cb = (struct irda_skb_cb *) skb->cb; cb = (struct irda_skb_cb *) skb->cb;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
line = cb->line; line = cb->line;
self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL); self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL);
if (!self) { if (!self) {
IRDA_DEBUG(2, __FUNCTION__ "(), didn't find myself\n"); IRDA_DEBUG(2, "%s(), didn't find myself\n", __FUNCTION__ );
return; return;
} }
...@@ -189,7 +189,7 @@ void ircomm_lmp_flow_control(struct sk_buff *skb) ...@@ -189,7 +189,7 @@ void ircomm_lmp_flow_control(struct sk_buff *skb)
self->pkt_count--; self->pkt_count--;
if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) { if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) {
IRDA_DEBUG(2, __FUNCTION__ "(), asking TTY to start again!\n"); IRDA_DEBUG(2, "%s(), asking TTY to start again!\n", __FUNCTION__ );
self->flow_status = FLOW_START; self->flow_status = FLOW_START;
if (self->notify.flow_indication) if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance, self->notify.flow_indication(self->notify.instance,
...@@ -215,12 +215,12 @@ int ircomm_lmp_data_request(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -215,12 +215,12 @@ int ircomm_lmp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
cb->line = self->line; cb->line = self->line;
IRDA_DEBUG(4, __FUNCTION__"(), sending frame\n"); IRDA_DEBUG(4, "%s(), sending frame\n", __FUNCTION__ );
skb->destructor = ircomm_lmp_flow_control; skb->destructor = ircomm_lmp_flow_control;
if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) { if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) {
IRDA_DEBUG(2, __FUNCTION__ "(), asking TTY to slow down!\n"); IRDA_DEBUG(2, "%s(), asking TTY to slow down!\n", __FUNCTION__ );
self->flow_status = FLOW_STOP; self->flow_status = FLOW_STOP;
if (self->notify.flow_indication) if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance, self->notify.flow_indication(self->notify.instance,
...@@ -246,7 +246,7 @@ int ircomm_lmp_data_indication(void *instance, void *sap, ...@@ -246,7 +246,7 @@ int ircomm_lmp_data_indication(void *instance, void *sap,
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -273,7 +273,7 @@ void ircomm_lmp_connect_confirm(void *instance, void *sap, ...@@ -273,7 +273,7 @@ void ircomm_lmp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -303,7 +303,7 @@ void ircomm_lmp_connect_indication(void *instance, void *sap, ...@@ -303,7 +303,7 @@ void ircomm_lmp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance; struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -330,7 +330,7 @@ void ircomm_lmp_disconnect_indication(void *instance, void *sap, ...@@ -330,7 +330,7 @@ void ircomm_lmp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, __FUNCTION__"()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
...@@ -121,7 +121,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) ...@@ -121,7 +121,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
struct sk_buff *skb; struct sk_buff *skb;
int count; int count;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
...@@ -162,7 +162,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) ...@@ -162,7 +162,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
spin_unlock_irqrestore(&self->spinlock, flags); spin_unlock_irqrestore(&self->spinlock, flags);
IRDA_DEBUG(2, __FUNCTION__ "(), skb->len=%d\n", skb->len); IRDA_DEBUG(2, "%s(), skb->len=%d\n", __FUNCTION__ , skb->len);
if (flush) { if (flush) {
/* ircomm_tty_do_softint will take care of the rest */ /* ircomm_tty_do_softint will take care of the rest */
...@@ -197,11 +197,11 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, ...@@ -197,11 +197,11 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
/* Find all common service types */ /* Find all common service types */
service_type &= self->service_type; service_type &= self->service_type;
if (!service_type) { if (!service_type) {
IRDA_DEBUG(2, __FUNCTION__ IRDA_DEBUG(2,
"(), No common service type to use!\n"); "%s(), No common service type to use!\n", __FUNCTION__ );
return -1; return -1;
} }
IRDA_DEBUG(0, __FUNCTION__ "(), services in common=%02x\n", IRDA_DEBUG(0, "%s(), services in common=%02x\n", __FUNCTION__ ,
service_type); service_type);
/* /*
...@@ -216,7 +216,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, ...@@ -216,7 +216,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
else if (service_type & IRCOMM_3_WIRE_RAW) else if (service_type & IRCOMM_3_WIRE_RAW)
self->settings.service_type = IRCOMM_3_WIRE_RAW; self->settings.service_type = IRCOMM_3_WIRE_RAW;
IRDA_DEBUG(0, __FUNCTION__ "(), resulting service type=0x%02x\n", IRDA_DEBUG(0, "%s(), resulting service type=0x%02x\n", __FUNCTION__ ,
self->settings.service_type); self->settings.service_type);
/* /*
...@@ -252,7 +252,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get) ...@@ -252,7 +252,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get)
else { else {
self->settings.port_type = (__u8) param->pv.i; self->settings.port_type = (__u8) param->pv.i;
IRDA_DEBUG(0, __FUNCTION__ "(), port type=%d\n", IRDA_DEBUG(0, "%s(), port type=%d\n", __FUNCTION__ ,
self->settings.port_type); self->settings.port_type);
} }
return 0; return 0;
...@@ -272,9 +272,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get) ...@@ -272,9 +272,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get)
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) { if (get) {
IRDA_DEBUG(0, __FUNCTION__ "(), not imp!\n"); IRDA_DEBUG(0, "%s(), not imp!\n", __FUNCTION__ );
} else { } else {
IRDA_DEBUG(0, __FUNCTION__ "(), port-name=%s\n", param->pv.c); IRDA_DEBUG(0, "%s(), port-name=%s\n", __FUNCTION__ , param->pv.c);
strncpy(self->settings.port_name, param->pv.c, 32); strncpy(self->settings.port_name, param->pv.c, 32);
} }
...@@ -299,7 +299,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get) ...@@ -299,7 +299,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get)
else else
self->settings.data_rate = param->pv.i; self->settings.data_rate = param->pv.i;
IRDA_DEBUG(2, __FUNCTION__ "(), data rate = %d\n", param->pv.i); IRDA_DEBUG(2, "%s(), data rate = %d\n", __FUNCTION__ , param->pv.i);
return 0; return 0;
} }
...@@ -345,7 +345,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param, ...@@ -345,7 +345,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param,
else else
self->settings.flow_control = (__u8) param->pv.i; self->settings.flow_control = (__u8) param->pv.i;
IRDA_DEBUG(1, __FUNCTION__ "(), flow control = 0x%02x\n", (__u8) param->pv.i); IRDA_DEBUG(1, "%s(), flow control = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i);
return 0; return 0;
} }
...@@ -371,7 +371,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get) ...@@ -371,7 +371,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get)
self->settings.xonxoff[1] = (__u16) param->pv.i >> 8; self->settings.xonxoff[1] = (__u16) param->pv.i >> 8;
} }
IRDA_DEBUG(0, __FUNCTION__ "(), XON/XOFF = 0x%02x,0x%02x\n", IRDA_DEBUG(0, "%s(), XON/XOFF = 0x%02x,0x%02x\n", __FUNCTION__ ,
param->pv.i & 0xff, param->pv.i >> 8); param->pv.i & 0xff, param->pv.i >> 8);
return 0; return 0;
...@@ -398,7 +398,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) ...@@ -398,7 +398,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
self->settings.enqack[1] = (__u16) param->pv.i >> 8; self->settings.enqack[1] = (__u16) param->pv.i >> 8;
} }
IRDA_DEBUG(0, __FUNCTION__ "(), ENQ/ACK = 0x%02x,0x%02x\n", IRDA_DEBUG(0, "%s(), ENQ/ACK = 0x%02x,0x%02x\n", __FUNCTION__ ,
param->pv.i & 0xff, param->pv.i >> 8); param->pv.i & 0xff, param->pv.i >> 8);
return 0; return 0;
...@@ -413,7 +413,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) ...@@ -413,7 +413,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
static int ircomm_param_line_status(void *instance, irda_param_t *param, static int ircomm_param_line_status(void *instance, irda_param_t *param,
int get) int get)
{ {
IRDA_DEBUG(2, __FUNCTION__ "(), not impl.\n"); IRDA_DEBUG(2, "%s(), not impl.\n", __FUNCTION__ );
return 0; return 0;
} }
...@@ -472,7 +472,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) ...@@ -472,7 +472,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 dce; __u8 dce;
IRDA_DEBUG(1, __FUNCTION__ "(), dce = 0x%02x\n", (__u8) param->pv.i); IRDA_DEBUG(1, "%s(), dce = 0x%02x\n", __FUNCTION__ , (__u8) param->pv.i);
dce = (__u8) param->pv.i; dce = (__u8) param->pv.i;
...@@ -484,7 +484,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) ...@@ -484,7 +484,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
/* Check if any of the settings have changed */ /* Check if any of the settings have changed */
if (dce & 0x0f) { if (dce & 0x0f) {
if (dce & IRCOMM_DELTA_CTS) { if (dce & IRCOMM_DELTA_CTS) {
IRDA_DEBUG(2, __FUNCTION__ "(), CTS \n"); IRDA_DEBUG(2, "%s(), CTS \n", __FUNCTION__ );
} }
} }
......
...@@ -49,7 +49,7 @@ int ircomm_open_tsap(struct ircomm_cb *self) ...@@ -49,7 +49,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
{ {
notify_t notify; notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
/* Register callbacks */ /* Register callbacks */
irda_notify_init(&notify); irda_notify_init(&notify);
...@@ -64,7 +64,7 @@ int ircomm_open_tsap(struct ircomm_cb *self) ...@@ -64,7 +64,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
&notify); &notify);
if (!self->tsap) { if (!self->tsap) {
IRDA_DEBUG(0, __FUNCTION__"failed to allocate tsap\n"); IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __FUNCTION__ );
return -1; return -1;
} }
self->slsap_sel = self->tsap->stsap_sel; self->slsap_sel = self->tsap->stsap_sel;
...@@ -92,7 +92,7 @@ int ircomm_ttp_connect_request(struct ircomm_cb *self, ...@@ -92,7 +92,7 @@ int ircomm_ttp_connect_request(struct ircomm_cb *self,
{ {
int ret = 0; int ret = 0;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = irttp_connect_request(self->tsap, info->dlsap_sel, ret = irttp_connect_request(self->tsap, info->dlsap_sel,
info->saddr, info->daddr, NULL, info->saddr, info->daddr, NULL,
...@@ -110,7 +110,7 @@ int ircomm_ttp_connect_response(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -110,7 +110,7 @@ int ircomm_ttp_connect_response(struct ircomm_cb *self, struct sk_buff *skb)
{ {
int ret; int ret;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ret = irttp_connect_response(self->tsap, TTP_SAR_DISABLE, skb); ret = irttp_connect_response(self->tsap, TTP_SAR_DISABLE, skb);
...@@ -133,7 +133,7 @@ int ircomm_ttp_data_request(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -133,7 +133,7 @@ int ircomm_ttp_data_request(struct ircomm_cb *self, struct sk_buff *skb,
ASSERT(skb != NULL, return -1;); ASSERT(skb != NULL, return -1;);
IRDA_DEBUG(2, __FUNCTION__"(), clen=%d\n", clen); IRDA_DEBUG(2, "%s(), clen=%d\n", __FUNCTION__ , clen);
/* /*
* Insert clen field, currently we either send data only, or control * Insert clen field, currently we either send data only, or control
...@@ -164,7 +164,7 @@ int ircomm_ttp_data_indication(void *instance, void *sap, ...@@ -164,7 +164,7 @@ int ircomm_ttp_data_indication(void *instance, void *sap,
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -184,7 +184,7 @@ void ircomm_ttp_connect_confirm(void *instance, void *sap, ...@@ -184,7 +184,7 @@ void ircomm_ttp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -221,7 +221,7 @@ void ircomm_ttp_connect_indication(void *instance, void *sap, ...@@ -221,7 +221,7 @@ void ircomm_ttp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance; struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(4, __FUNCTION__"()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -272,7 +272,7 @@ void ircomm_ttp_disconnect_indication(void *instance, void *sap, ...@@ -272,7 +272,7 @@ void ircomm_ttp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -292,7 +292,7 @@ void ircomm_ttp_flow_indication(void *instance, void *sap, LOCAL_FLOW cmd) ...@@ -292,7 +292,7 @@ void ircomm_ttp_flow_indication(void *instance, void *sap, LOCAL_FLOW cmd)
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRCOMM_MAGIC, return;); ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
This diff is collapsed.
This diff is collapsed.
...@@ -58,7 +58,7 @@ void ircomm_tty_change_speed(struct ircomm_tty_cb *self) ...@@ -58,7 +58,7 @@ void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
unsigned cflag, cval; unsigned cflag, cval;
int baud; int baud;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (!self->tty || !self->tty->termios || !self->ircomm) if (!self->tty || !self->tty->termios || !self->ircomm)
return; return;
...@@ -151,7 +151,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty, ...@@ -151,7 +151,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int cflag = tty->termios->c_cflag; unsigned int cflag = tty->termios->c_cflag;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if ((cflag == old_termios->c_cflag) && if ((cflag == old_termios->c_cflag) &&
(RELEVANT_IFLAG(tty->termios->c_iflag) == (RELEVANT_IFLAG(tty->termios->c_iflag) ==
...@@ -200,7 +200,7 @@ static int ircomm_tty_get_modem_info(struct ircomm_tty_cb *self, ...@@ -200,7 +200,7 @@ static int ircomm_tty_get_modem_info(struct ircomm_tty_cb *self,
{ {
unsigned int result; unsigned int result;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
result = ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0) result = ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0)
| ((self->settings.dte & IRCOMM_DTR) ? TIOCM_DTR : 0) | ((self->settings.dte & IRCOMM_DTR) ? TIOCM_DTR : 0)
...@@ -224,7 +224,7 @@ static int ircomm_tty_set_modem_info(struct ircomm_tty_cb *self, ...@@ -224,7 +224,7 @@ static int ircomm_tty_set_modem_info(struct ircomm_tty_cb *self,
unsigned int arg; unsigned int arg;
__u8 old_rts, old_dtr; __u8 old_rts, old_dtr;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
...@@ -286,7 +286,7 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self, ...@@ -286,7 +286,7 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
if (!retinfo) if (!retinfo)
return -EFAULT; return -EFAULT;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.line = self->line; info.line = self->line;
...@@ -322,7 +322,7 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self, ...@@ -322,7 +322,7 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
struct serial_struct new_serial; struct serial_struct new_serial;
struct ircomm_tty_cb old_state, *state; struct ircomm_tty_cb old_state, *state;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (copy_from_user(&new_serial,new_info,sizeof(new_serial))) if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
return -EFAULT; return -EFAULT;
...@@ -396,7 +396,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, ...@@ -396,7 +396,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
...@@ -425,7 +425,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, ...@@ -425,7 +425,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
break; break;
case TIOCGICOUNT: case TIOCGICOUNT:
IRDA_DEBUG(0, __FUNCTION__ "(), TIOCGICOUNT not impl!\n"); IRDA_DEBUG(0, "%s(), TIOCGICOUNT not impl!\n", __FUNCTION__ );
#if 0 #if 0
save_flags(flags); cli(); save_flags(flags); cli();
cnow = driver->icount; cnow = driver->icount;
......
...@@ -111,7 +111,7 @@ int __init irda_device_init( void) ...@@ -111,7 +111,7 @@ int __init irda_device_init( void)
void __exit irda_device_cleanup(void) void __exit irda_device_cleanup(void)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete); hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
hashbin_delete(dongles, NULL); hashbin_delete(dongles, NULL);
...@@ -127,7 +127,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status) ...@@ -127,7 +127,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
{ {
struct irlap_cb *self; struct irlap_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "(%s)\n", status ? "TRUE" : "FALSE"); IRDA_DEBUG(4, "%s(%s)\n", __FUNCTION__, status ? "TRUE" : "FALSE");
self = (struct irlap_cb *) dev->atalk_ptr; self = (struct irlap_cb *) dev->atalk_ptr;
...@@ -152,7 +152,7 @@ int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts) ...@@ -152,7 +152,7 @@ int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts)
struct if_irda_req req; struct if_irda_req req;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) { if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n", ERROR("%s: do_ioctl not impl. by device driver\n",
...@@ -173,7 +173,7 @@ int irda_device_change_speed(struct net_device *dev, __u32 speed) ...@@ -173,7 +173,7 @@ int irda_device_change_speed(struct net_device *dev, __u32 speed)
struct if_irda_req req; struct if_irda_req req;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) { if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n", ERROR("%s: do_ioctl not impl. by device driver\n",
...@@ -199,7 +199,7 @@ int irda_device_is_receiving(struct net_device *dev) ...@@ -199,7 +199,7 @@ int irda_device_is_receiving(struct net_device *dev)
struct if_irda_req req; struct if_irda_req req;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) { if (!dev->do_ioctl) {
ERROR("%s: do_ioctl not impl. by device driver\n", ERROR("%s: do_ioctl not impl. by device driver\n",
...@@ -216,7 +216,7 @@ int irda_device_is_receiving(struct net_device *dev) ...@@ -216,7 +216,7 @@ int irda_device_is_receiving(struct net_device *dev)
void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state) void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state)
{ {
IRDA_DEBUG(2, __FUNCTION__ "(), state = %s\n", task_state[state]); IRDA_DEBUG(2, "%s(), state = %s\n", __FUNCTION__, task_state[state]);
task->state = state; task->state = state;
} }
...@@ -250,7 +250,7 @@ int irda_task_kick(struct irda_task *task) ...@@ -250,7 +250,7 @@ int irda_task_kick(struct irda_task *task)
int count = 0; int count = 0;
int timeout; int timeout;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
ASSERT(task != NULL, return -1;); ASSERT(task != NULL, return -1;);
ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;); ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
...@@ -298,8 +298,8 @@ int irda_task_kick(struct irda_task *task) ...@@ -298,8 +298,8 @@ int irda_task_kick(struct irda_task *task)
irda_task_timer_expired); irda_task_timer_expired);
finished = FALSE; finished = FALSE;
} else { } else {
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
"(), not finished, and no timeout!\n"); __FUNCTION__);
finished = FALSE; finished = FALSE;
} }
...@@ -328,7 +328,7 @@ struct irda_task *irda_task_execute(void *instance, ...@@ -328,7 +328,7 @@ struct irda_task *irda_task_execute(void *instance,
struct irda_task *task; struct irda_task *task;
int ret; int ret;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
task = kmalloc(sizeof(struct irda_task), GFP_ATOMIC); task = kmalloc(sizeof(struct irda_task), GFP_ATOMIC);
if (!task) if (!task)
...@@ -365,7 +365,7 @@ static void irda_task_timer_expired(void *data) ...@@ -365,7 +365,7 @@ static void irda_task_timer_expired(void *data)
{ {
struct irda_task *task; struct irda_task *task;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
task = (struct irda_task *) data; task = (struct irda_task *) data;
...@@ -517,7 +517,7 @@ int irda_device_set_mode(struct net_device* dev, int mode) ...@@ -517,7 +517,7 @@ int irda_device_set_mode(struct net_device* dev, int mode)
struct if_irda_req req; struct if_irda_req req;
int ret; int ret;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
if (!dev->do_ioctl) { if (!dev->do_ioctl) {
ERROR("%s: set_raw_mode not impl. by device driver\n", ERROR("%s: set_raw_mode not impl. by device driver\n",
......
This diff is collapsed.
...@@ -181,7 +181,7 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -181,7 +181,7 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
case IAP_LM_DISCONNECT_INDICATION: case IAP_LM_DISCONNECT_INDICATION:
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__"(), Unknown event %d\n", event); IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break; break;
} }
} }
...@@ -213,7 +213,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -213,7 +213,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_client_state(self, S_DISCONNECT); iriap_next_client_state(self, S_DISCONNECT);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break; break;
} }
} }
...@@ -262,7 +262,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -262,7 +262,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_call_state(self, S_OUTSTANDING); iriap_next_call_state(self, S_OUTSTANDING);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
break; break;
...@@ -278,7 +278,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -278,7 +278,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
/* /*
...@@ -300,7 +300,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -300,7 +300,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_call_state(self, S_WAIT_FOR_CALL); iriap_next_call_state(self, S_WAIT_FOR_CALL);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
break; break;
} }
} }
...@@ -313,7 +313,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -313,7 +313,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
/* /*
...@@ -325,7 +325,7 @@ static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -325,7 +325,7 @@ static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
...@@ -338,7 +338,7 @@ static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -338,7 +338,7 @@ static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_s_wait_active(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
/************************************************************************** /**************************************************************************
...@@ -385,7 +385,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -385,7 +385,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event %d\n", event); IRDA_DEBUG(0, "%s(), unknown event %d\n", __FUNCTION__, event);
break; break;
} }
} }
...@@ -396,7 +396,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -396,7 +396,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
switch (event) { switch (event) {
case IAP_LM_DISCONNECT_INDICATION: case IAP_LM_DISCONNECT_INDICATION:
...@@ -405,7 +405,7 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -405,7 +405,7 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
iriap_next_r_connect_state(self, R_WAITING); iriap_next_r_connect_state(self, R_WAITING);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n"); IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break; break;
} }
} }
...@@ -420,13 +420,13 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -420,13 +420,13 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_waiting(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_waiting(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), Not implemented\n"); IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
} }
/* /*
...@@ -438,7 +438,7 @@ static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -438,7 +438,7 @@ static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
switch (event) { switch (event) {
case IAP_RECV_F_LST: case IAP_RECV_F_LST:
...@@ -447,7 +447,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -447,7 +447,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
iriap_call_indication(self, skb); iriap_call_indication(self, skb);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n"); IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break; break;
} }
...@@ -462,12 +462,12 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -462,12 +462,12 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(skb != NULL, return;); ASSERT(skb != NULL, return;);
if (!self || self->magic != IAS_MAGIC) { if (!self || self->magic != IAS_MAGIC) {
IRDA_DEBUG(0, __FUNCTION__ "(), bad pointer self\n"); IRDA_DEBUG(0, "%s(), bad pointer self\n", __FUNCTION__);
return; return;
} }
...@@ -482,7 +482,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -482,7 +482,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
irlmp_data_request(self->lsap, skb); irlmp_data_request(self->lsap, skb);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), unknown event!\n"); IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
break; break;
} }
} }
...@@ -490,7 +490,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event, ...@@ -490,7 +490,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
static void state_r_returning(struct iriap_cb *self, IRIAP_EVENT event, static void state_r_returning(struct iriap_cb *self, IRIAP_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), event=%d\n", event); IRDA_DEBUG(0, "%s(), event=%d\n", __FUNCTION__, event);
switch (event) { switch (event) {
case IAP_RECV_F_LST: case IAP_RECV_F_LST:
......
...@@ -79,12 +79,13 @@ struct ias_object *irias_new_object( char *name, int id) ...@@ -79,12 +79,13 @@ struct ias_object *irias_new_object( char *name, int id)
{ {
struct ias_object *obj; struct ias_object *obj;
IRDA_DEBUG( 4, __FUNCTION__ "()\n"); IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
obj = (struct ias_object *) kmalloc(sizeof(struct ias_object), obj = (struct ias_object *) kmalloc(sizeof(struct ias_object),
GFP_ATOMIC); GFP_ATOMIC);
if (obj == NULL) { if (obj == NULL) {
IRDA_DEBUG(0, __FUNCTION__ "(), Unable to allocate object!\n"); IRDA_DEBUG(0, "%s(), Unable to allocate object!\n",
__FUNCTION__);
return NULL; return NULL;
} }
memset(obj, 0, sizeof( struct ias_object)); memset(obj, 0, sizeof( struct ias_object));
...@@ -295,8 +296,8 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name, ...@@ -295,8 +296,8 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name,
} }
if ( attrib->value->type != new_value->type) { if ( attrib->value->type != new_value->type) {
IRDA_DEBUG( 0, __FUNCTION__ IRDA_DEBUG( 0, "%s(), changing value type not allowed!\n",
"(), changing value type not allowed!\n"); __FUNCTION__);
spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags); spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags);
return -1; return -1;
} }
...@@ -521,7 +522,7 @@ struct ias_value *irias_new_missing_value(void) ...@@ -521,7 +522,7 @@ struct ias_value *irias_new_missing_value(void)
*/ */
void irias_delete_value(struct ias_value *value) void irias_delete_value(struct ias_value *value)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(value != NULL, return;); ASSERT(value != NULL, return;);
...@@ -541,7 +542,7 @@ void irias_delete_value(struct ias_value *value) ...@@ -541,7 +542,7 @@ void irias_delete_value(struct ias_value *value)
kfree(value->t.oct_seq); kfree(value->t.oct_seq);
break; break;
default: default:
IRDA_DEBUG(0, __FUNCTION__ "(), Unknown value type!\n"); IRDA_DEBUG(0, "%s(), Unknown value type!\n", __FUNCTION__);
break; break;
} }
kfree(value); kfree(value);
......
...@@ -71,7 +71,7 @@ static void irlan_client_kick_timer_expired(void *data) ...@@ -71,7 +71,7 @@ static void irlan_client_kick_timer_expired(void *data)
{ {
struct irlan_cb *self = (struct irlan_cb *) data; struct irlan_cb *self = (struct irlan_cb *) data;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -90,7 +90,7 @@ static void irlan_client_kick_timer_expired(void *data) ...@@ -90,7 +90,7 @@ static void irlan_client_kick_timer_expired(void *data)
void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout) void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
irda_start_timer(&self->client.kick_timer, timeout, (void *) self, irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
irlan_client_kick_timer_expired); irlan_client_kick_timer_expired);
...@@ -104,7 +104,7 @@ void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout) ...@@ -104,7 +104,7 @@ void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
*/ */
void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr) void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
{ {
IRDA_DEBUG(1, __FUNCTION__ "()\n"); IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -116,7 +116,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr) ...@@ -116,7 +116,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
if ((self->client.state != IRLAN_IDLE) || if ((self->client.state != IRLAN_IDLE) ||
(self->provider.access_type == ACCESS_DIRECT)) (self->provider.access_type == ACCESS_DIRECT))
{ {
IRDA_DEBUG(0, __FUNCTION__ "(), already awake!\n"); IRDA_DEBUG(0, "%s(), already awake!\n", __FUNCTION__ );
return; return;
} }
...@@ -125,7 +125,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr) ...@@ -125,7 +125,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
self->daddr = daddr; self->daddr = daddr;
if (self->disconnect_reason == LM_USER_REQUEST) { if (self->disconnect_reason == LM_USER_REQUEST) {
IRDA_DEBUG(0, __FUNCTION__ "(), still stopped by user\n"); IRDA_DEBUG(0, "%s(), still stopped by user\n", __FUNCTION__ );
return; return;
} }
...@@ -152,7 +152,7 @@ void irlan_client_discovery_indication(discovery_t *discovery, ...@@ -152,7 +152,7 @@ void irlan_client_discovery_indication(discovery_t *discovery,
struct irlan_cb *self; struct irlan_cb *self;
__u32 saddr, daddr; __u32 saddr, daddr;
IRDA_DEBUG(1, __FUNCTION__"()\n"); IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
ASSERT(irlan != NULL, return;); ASSERT(irlan != NULL, return;);
ASSERT(discovery != NULL, return;); ASSERT(discovery != NULL, return;);
...@@ -174,7 +174,7 @@ void irlan_client_discovery_indication(discovery_t *discovery, ...@@ -174,7 +174,7 @@ void irlan_client_discovery_indication(discovery_t *discovery,
if (self) { if (self) {
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_DEBUG(1, __FUNCTION__ "(), Found instance (%08x)!\n", IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ ,
daddr); daddr);
irlan_client_wakeup(self, saddr, daddr); irlan_client_wakeup(self, saddr, daddr);
...@@ -192,7 +192,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap, ...@@ -192,7 +192,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
...@@ -203,7 +203,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap, ...@@ -203,7 +203,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb); irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb);
/* Ready for a new command */ /* Ready for a new command */
IRDA_DEBUG(2, __FUNCTION__ "(), clearing tx_busy\n"); IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __FUNCTION__ );
self->client.tx_busy = FALSE; self->client.tx_busy = FALSE;
/* Check if we have some queued commands waiting to be sent */ /* Check if we have some queued commands waiting to be sent */
...@@ -220,7 +220,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap, ...@@ -220,7 +220,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
struct tsap_cb *tsap; struct tsap_cb *tsap;
struct sk_buff *skb; struct sk_buff *skb;
IRDA_DEBUG(4, __FUNCTION__ "(), reason=%d\n", reason); IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap; tsap = (struct tsap_cb *) sap;
...@@ -252,7 +252,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self) ...@@ -252,7 +252,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
struct tsap_cb *tsap; struct tsap_cb *tsap;
notify_t notify; notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -272,7 +272,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self) ...@@ -272,7 +272,7 @@ void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify); tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
if (!tsap) { if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n"); IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return; return;
} }
self->client.tsap_ctrl = tsap; self->client.tsap_ctrl = tsap;
...@@ -292,7 +292,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap, ...@@ -292,7 +292,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
...@@ -318,7 +318,7 @@ void irlan_client_reconnect_data_channel(struct irlan_cb *self) ...@@ -318,7 +318,7 @@ void irlan_client_reconnect_data_channel(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -361,7 +361,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb) ...@@ -361,7 +361,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
ASSERT(skb != NULL, return;); ASSERT(skb != NULL, return;);
IRDA_DEBUG(4, __FUNCTION__ "() skb->len=%d\n", (int) skb->len); IRDA_DEBUG(4, "%s() skb->len=%d\n", __FUNCTION__ , (int) skb->len);
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -392,7 +392,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb) ...@@ -392,7 +392,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
/* How many parameters? */ /* How many parameters? */
count = frame[1]; count = frame[1];
IRDA_DEBUG(4, __FUNCTION__ "(), got %d parameters\n", count); IRDA_DEBUG(4, "%s(), got %d parameters\n", __FUNCTION__ , count);
ptr = frame+2; ptr = frame+2;
...@@ -400,7 +400,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb) ...@@ -400,7 +400,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
for (i=0; i<count;i++) { for (i=0; i<count;i++) {
ret = irlan_extract_param(ptr, name, value, &val_len); ret = irlan_extract_param(ptr, name, value, &val_len);
if (ret < 0) { if (ret < 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAN, Error!\n"); IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ );
break; break;
} }
ptr += ret; ptr += ret;
...@@ -424,7 +424,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param, ...@@ -424,7 +424,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
__u8 *bytes; __u8 *bytes;
int i; int i;
IRDA_DEBUG(4, __FUNCTION__ "(), parm=%s\n", param); IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -462,7 +462,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param, ...@@ -462,7 +462,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
else if (strcmp(value, "HOSTED") == 0) else if (strcmp(value, "HOSTED") == 0)
self->client.access_type = ACCESS_HOSTED; self->client.access_type = ACCESS_HOSTED;
else { else {
IRDA_DEBUG(2, __FUNCTION__ "(), unknown access type!\n"); IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__ );
} }
} }
/* IRLAN version */ /* IRLAN version */
...@@ -484,14 +484,14 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param, ...@@ -484,14 +484,14 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
memcpy(&tmp_cpu, value, 2); /* Align value */ memcpy(&tmp_cpu, value, 2); /* Align value */
le16_to_cpus(&tmp_cpu); /* Convert to host order */ le16_to_cpus(&tmp_cpu); /* Convert to host order */
self->client.recv_arb_val = tmp_cpu; self->client.recv_arb_val = tmp_cpu;
IRDA_DEBUG(2, __FUNCTION__ "(), receive arb val=%d\n", IRDA_DEBUG(2, "%s(), receive arb val=%d\n", __FUNCTION__ ,
self->client.recv_arb_val); self->client.recv_arb_val);
} }
if (strcmp(param, "MAX_FRAME") == 0) { if (strcmp(param, "MAX_FRAME") == 0) {
memcpy(&tmp_cpu, value, 2); /* Align value */ memcpy(&tmp_cpu, value, 2); /* Align value */
le16_to_cpus(&tmp_cpu); /* Convert to host order */ le16_to_cpus(&tmp_cpu); /* Convert to host order */
self->client.max_frame = tmp_cpu; self->client.max_frame = tmp_cpu;
IRDA_DEBUG(4, __FUNCTION__ "(), max frame=%d\n", IRDA_DEBUG(4, "%s(), max frame=%d\n", __FUNCTION__ ,
self->client.max_frame); self->client.max_frame);
} }
...@@ -526,7 +526,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id, ...@@ -526,7 +526,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(priv != NULL, return;); ASSERT(priv != NULL, return;);
...@@ -539,7 +539,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id, ...@@ -539,7 +539,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
/* Check if request succeeded */ /* Check if request succeeded */
if (result != IAS_SUCCESS) { if (result != IAS_SUCCESS) {
IRDA_DEBUG(2, __FUNCTION__ "(), got NULL value!\n"); IRDA_DEBUG(2, "%s(), got NULL value!\n", __FUNCTION__ );
irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
NULL); NULL);
return; return;
...@@ -557,7 +557,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id, ...@@ -557,7 +557,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
irias_delete_value(value); irias_delete_value(value);
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown type!\n"); IRDA_DEBUG(2, "%s(), unknown type!\n", __FUNCTION__ );
break; break;
} }
irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL); irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL);
......
...@@ -92,7 +92,7 @@ void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -92,7 +92,7 @@ void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;); ASSERT(self->magic == IRLAN_MAGIC, return -1;);
...@@ -113,10 +113,10 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -113,10 +113,10 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
"IrLAN", "IrDA:TinyTP:LsapSel"); "IrLAN", "IrDA:TinyTP:LsapSel");
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(4, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -135,7 +135,7 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -135,7 +135,7 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;); ASSERT(self->magic == IRLAN_MAGIC, return -1;);
...@@ -153,7 +153,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -153,7 +153,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_CONN); irlan_next_client_state(self, IRLAN_CONN);
break; break;
case IRLAN_IAS_PROVIDER_NOT_AVAIL: case IRLAN_IAS_PROVIDER_NOT_AVAIL:
IRDA_DEBUG(2, __FUNCTION__ "(), IAS_PROVIDER_NOT_AVAIL\n"); IRDA_DEBUG(2, "%s(), IAS_PROVIDER_NOT_AVAIL\n", __FUNCTION__ );
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
/* Give the client a kick! */ /* Give the client a kick! */
...@@ -166,10 +166,10 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -166,10 +166,10 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__"(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -188,7 +188,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -188,7 +188,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -203,10 +203,10 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -203,10 +203,10 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -223,7 +223,7 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -223,7 +223,7 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -243,10 +243,10 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -243,10 +243,10 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -265,7 +265,7 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -265,7 +265,7 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -280,10 +280,10 @@ static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -280,10 +280,10 @@ static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -304,7 +304,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -304,7 +304,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
{ {
struct qos_info qos; struct qos_info qos;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -343,7 +343,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -343,7 +343,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_DATA); irlan_next_client_state(self, IRLAN_DATA);
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown access type!\n"); IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__ );
break; break;
} }
break; break;
...@@ -352,10 +352,10 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -352,10 +352,10 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
...@@ -375,7 +375,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -375,7 +375,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -389,10 +389,10 @@ static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -389,10 +389,10 @@ static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -406,7 +406,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -406,7 +406,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
{ {
struct qos_info qos; struct qos_info qos;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
...@@ -428,7 +428,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -428,7 +428,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
} else if (self->client.recv_arb_val > } else if (self->client.recv_arb_val >
self->provider.send_arb_val) self->provider.send_arb_val)
{ {
IRDA_DEBUG(2, __FUNCTION__ "(), lost the battle :-(\n"); IRDA_DEBUG(2, "%s(), lost the battle :-(\n", __FUNCTION__ );
} }
break; break;
case IRLAN_DATA_CONNECT_INDICATION: case IRLAN_DATA_CONNECT_INDICATION:
...@@ -439,10 +439,10 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -439,10 +439,10 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
case IRLAN_WATCHDOG_TIMEOUT: case IRLAN_WATCHDOG_TIMEOUT:
IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n"); IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -461,7 +461,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -461,7 +461,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;); ASSERT(self->magic == IRLAN_MAGIC, return -1;);
...@@ -475,7 +475,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -475,7 +475,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
irlan_next_client_state(self, IRLAN_IDLE); irlan_next_client_state(self, IRLAN_IDLE);
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event); IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
break; break;
} }
if (skb) if (skb)
...@@ -493,7 +493,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -493,7 +493,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -510,7 +510,7 @@ static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event, ...@@ -510,7 +510,7 @@ static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event, static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb) struct sk_buff *skb)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
......
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
* Master structure * Master structure
*/ */
hashbin_t *irlan = NULL; hashbin_t *irlan = NULL;
static __u32 ckey, skey; static void *ckey;
static void *skey;
/* Module parameters */ /* Module parameters */
static int eth = 0; /* Use "eth" or "irlan" name for devices */ static int eth = 0; /* Use "eth" or "irlan" name for devices */
...@@ -122,7 +123,7 @@ int __init irlan_init(void) ...@@ -122,7 +123,7 @@ int __init irlan_init(void)
struct irlan_cb *new; struct irlan_cb *new;
__u16 hints; __u16 hints;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Allocate master structure */ /* Allocate master structure */
irlan = hashbin_new(HB_LOCK); /* protect from /proc */ irlan = hashbin_new(HB_LOCK); /* protect from /proc */
if (irlan == NULL) { if (irlan == NULL) {
...@@ -133,7 +134,7 @@ int __init irlan_init(void) ...@@ -133,7 +134,7 @@ int __init irlan_init(void)
create_proc_info_entry("irlan", 0, proc_irda, irlan_proc_read); create_proc_info_entry("irlan", 0, proc_irda, irlan_proc_read);
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
hints = irlmp_service_to_hint(S_LAN); hints = irlmp_service_to_hint(S_LAN);
/* Register with IrLMP as a client */ /* Register with IrLMP as a client */
...@@ -157,7 +158,7 @@ int __init irlan_init(void) ...@@ -157,7 +158,7 @@ int __init irlan_init(void)
void __exit irlan_cleanup(void) void __exit irlan_cleanup(void)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
irlmp_unregister_client(ckey); irlmp_unregister_client(ckey);
irlmp_unregister_service(skey); irlmp_unregister_service(skey);
...@@ -181,7 +182,7 @@ int irlan_register_netdev(struct irlan_cb *self) ...@@ -181,7 +182,7 @@ int irlan_register_netdev(struct irlan_cb *self)
{ {
int i=0; int i=0;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
/* Check if we should call the device eth<x> or irlan<x> */ /* Check if we should call the device eth<x> or irlan<x> */
if (!eth) { if (!eth) {
...@@ -192,7 +193,7 @@ int irlan_register_netdev(struct irlan_cb *self) ...@@ -192,7 +193,7 @@ int irlan_register_netdev(struct irlan_cb *self)
} }
if (register_netdev(&self->dev) != 0) { if (register_netdev(&self->dev) != 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), register_netdev() failed!\n"); IRDA_DEBUG(2, "%s(), register_netdev() failed!\n", __FUNCTION__ );
return -1; return -1;
} }
return 0; return 0;
...@@ -208,7 +209,7 @@ struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr) ...@@ -208,7 +209,7 @@ struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(irlan != NULL, return NULL;); ASSERT(irlan != NULL, return NULL;);
/* /*
...@@ -264,7 +265,7 @@ static void __irlan_close(struct irlan_cb *self) ...@@ -264,7 +265,7 @@ static void __irlan_close(struct irlan_cb *self)
{ {
struct sk_buff *skb; struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -301,7 +302,7 @@ void irlan_connect_indication(void *instance, void *sap, struct qos_info *qos, ...@@ -301,7 +302,7 @@ void irlan_connect_indication(void *instance, void *sap, struct qos_info *qos,
struct irlan_cb *self; struct irlan_cb *self;
struct tsap_cb *tsap; struct tsap_cb *tsap;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap; tsap = (struct tsap_cb *) sap;
...@@ -390,7 +391,7 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason, ...@@ -390,7 +391,7 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason,
struct irlan_cb *self; struct irlan_cb *self;
struct tsap_cb *tsap; struct tsap_cb *tsap;
IRDA_DEBUG(0, __FUNCTION__ "(), reason=%d\n", reason); IRDA_DEBUG(0, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap; tsap = (struct tsap_cb *) sap;
...@@ -409,19 +410,19 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason, ...@@ -409,19 +410,19 @@ void irlan_disconnect_indication(void *instance, void *sap, LM_REASON reason,
switch (reason) { switch (reason) {
case LM_USER_REQUEST: /* User request */ case LM_USER_REQUEST: /* User request */
IRDA_DEBUG(2, __FUNCTION__ "(), User requested\n"); IRDA_DEBUG(2, "%s(), User requested\n", __FUNCTION__ );
break; break;
case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */ case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
IRDA_DEBUG(2, __FUNCTION__ "(), Unexpected IrLAP disconnect\n"); IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __FUNCTION__ );
break; break;
case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */ case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAP connect failed\n"); IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __FUNCTION__ );
break; break;
case LM_LAP_RESET: /* IrLAP reset */ case LM_LAP_RESET: /* IrLAP reset */
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAP reset\n"); IRDA_DEBUG(2, "%s(), IrLAP reset\n", __FUNCTION__ );
break; break;
case LM_INIT_DISCONNECT: case LM_INIT_DISCONNECT:
IRDA_DEBUG(2, __FUNCTION__ "(), IrLMP connect failed\n"); IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __FUNCTION__ );
break; break;
default: default:
ERROR("%s(), Unknown disconnect reason\n", __FUNCTION__); ERROR("%s(), Unknown disconnect reason\n", __FUNCTION__);
...@@ -446,7 +447,7 @@ void irlan_open_data_tsap(struct irlan_cb *self) ...@@ -446,7 +447,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
struct tsap_cb *tsap; struct tsap_cb *tsap;
notify_t notify; notify_t notify;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -468,7 +469,7 @@ void irlan_open_data_tsap(struct irlan_cb *self) ...@@ -468,7 +469,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify); tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
if (!tsap) { if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n"); IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return; return;
} }
self->tsap_data = tsap; self->tsap_data = tsap;
...@@ -482,7 +483,7 @@ void irlan_open_data_tsap(struct irlan_cb *self) ...@@ -482,7 +483,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
void irlan_close_tsaps(struct irlan_cb *self) void irlan_close_tsaps(struct irlan_cb *self)
{ {
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -572,7 +573,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self) ...@@ -572,7 +573,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
{ {
struct sk_buff *skb; struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
if (irda_lock(&self->client.tx_busy) == FALSE) if (irda_lock(&self->client.tx_busy) == FALSE)
return -EBUSY; return -EBUSY;
...@@ -591,7 +592,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self) ...@@ -591,7 +592,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -1; return -1;
} }
IRDA_DEBUG(2, __FUNCTION__ "(), sending ...\n"); IRDA_DEBUG(2, "%s(), sending ...\n", __FUNCTION__ );
return irttp_data_request(self->client.tsap_ctrl, skb); return irttp_data_request(self->client.tsap_ctrl, skb);
} }
...@@ -604,7 +605,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self) ...@@ -604,7 +605,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
*/ */
void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb) void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb)
{ {
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Queue command */ /* Queue command */
skb_queue_tail(&self->client.txq, skb); skb_queue_tail(&self->client.txq, skb);
...@@ -624,7 +625,7 @@ void irlan_get_provider_info(struct irlan_cb *self) ...@@ -624,7 +625,7 @@ void irlan_get_provider_info(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -656,7 +657,7 @@ void irlan_open_data_channel(struct irlan_cb *self) ...@@ -656,7 +657,7 @@ void irlan_open_data_channel(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -688,7 +689,7 @@ void irlan_close_data_channel(struct irlan_cb *self) ...@@ -688,7 +689,7 @@ void irlan_close_data_channel(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -727,7 +728,7 @@ void irlan_open_unicast_addr(struct irlan_cb *self) ...@@ -727,7 +728,7 @@ void irlan_open_unicast_addr(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -765,7 +766,7 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status) ...@@ -765,7 +766,7 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -804,7 +805,7 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status) ...@@ -804,7 +805,7 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -844,7 +845,7 @@ void irlan_get_unicast_addr(struct irlan_cb *self) ...@@ -844,7 +845,7 @@ void irlan_get_unicast_addr(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -879,7 +880,7 @@ void irlan_get_media_char(struct irlan_cb *self) ...@@ -879,7 +880,7 @@ void irlan_get_media_char(struct irlan_cb *self)
struct sk_buff *skb; struct sk_buff *skb;
__u8 *frame; __u8 *frame;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -964,7 +965,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type, ...@@ -964,7 +965,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
int n=0; int n=0;
if (skb == NULL) { if (skb == NULL) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got NULL skb\n"); IRDA_DEBUG(2, "%s(), Got NULL skb\n", __FUNCTION__ );
return 0; return 0;
} }
...@@ -981,7 +982,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type, ...@@ -981,7 +982,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
ASSERT(value_len > 0, return 0;); ASSERT(value_len > 0, return 0;);
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown parameter type!\n"); IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __FUNCTION__ );
return 0; return 0;
break; break;
} }
...@@ -991,7 +992,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type, ...@@ -991,7 +992,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
/* Make space for data */ /* Make space for data */
if (skb_tailroom(skb) < (param_len+value_len+3)) { if (skb_tailroom(skb) < (param_len+value_len+3)) {
IRDA_DEBUG(2, __FUNCTION__ "(), No more space at end of skb\n"); IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __FUNCTION__ );
return 0; return 0;
} }
skb_put(skb, param_len+value_len+3); skb_put(skb, param_len+value_len+3);
...@@ -1038,13 +1039,13 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len) ...@@ -1038,13 +1039,13 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
__u16 val_len; __u16 val_len;
int n=0; int n=0;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
/* get length of parameter name (1 byte) */ /* get length of parameter name (1 byte) */
name_len = buf[n++]; name_len = buf[n++];
if (name_len > 254) { if (name_len > 254) {
IRDA_DEBUG(2, __FUNCTION__ "(), name_len > 254\n"); IRDA_DEBUG(2, "%s(), name_len > 254\n", __FUNCTION__ );
return -RSP_INVALID_COMMAND_FORMAT; return -RSP_INVALID_COMMAND_FORMAT;
} }
...@@ -1061,7 +1062,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len) ...@@ -1061,7 +1062,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
le16_to_cpus(&val_len); n+=2; le16_to_cpus(&val_len); n+=2;
if (val_len > 1016) { if (val_len > 1016) {
IRDA_DEBUG(2, __FUNCTION__ "(), parameter length to long\n"); IRDA_DEBUG(2, "%s(), parameter length to long\n", __FUNCTION__ );
return -RSP_INVALID_COMMAND_FORMAT; return -RSP_INVALID_COMMAND_FORMAT;
} }
*len = val_len; *len = val_len;
......
...@@ -50,7 +50,7 @@ int irlan_eth_init(struct net_device *dev) ...@@ -50,7 +50,7 @@ int irlan_eth_init(struct net_device *dev)
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__"()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;); ASSERT(dev != NULL, return -1;);
...@@ -107,7 +107,7 @@ int irlan_eth_open(struct net_device *dev) ...@@ -107,7 +107,7 @@ int irlan_eth_open(struct net_device *dev)
{ {
struct irlan_cb *self; struct irlan_cb *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(dev != NULL, return -1;); ASSERT(dev != NULL, return -1;);
...@@ -143,7 +143,7 @@ int irlan_eth_close(struct net_device *dev) ...@@ -143,7 +143,7 @@ int irlan_eth_close(struct net_device *dev)
struct irlan_cb *self = (struct irlan_cb *) dev->priv; struct irlan_cb *self = (struct irlan_cb *) dev->priv;
struct sk_buff *skb; struct sk_buff *skb;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
/* Stop device */ /* Stop device */
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -356,14 +356,14 @@ void irlan_eth_set_multicast_list(struct net_device *dev) ...@@ -356,14 +356,14 @@ void irlan_eth_set_multicast_list(struct net_device *dev)
self = dev->priv; self = dev->priv;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
/* Check if data channel has been connected yet */ /* Check if data channel has been connected yet */
if (self->client.state != IRLAN_DATA) { if (self->client.state != IRLAN_DATA) {
IRDA_DEBUG(1, __FUNCTION__ "(), delaying!\n"); IRDA_DEBUG(1, "%s(), delaying!\n", __FUNCTION__ );
return; return;
} }
...@@ -373,20 +373,20 @@ void irlan_eth_set_multicast_list(struct net_device *dev) ...@@ -373,20 +373,20 @@ void irlan_eth_set_multicast_list(struct net_device *dev)
} }
else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) { else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) {
/* Disable promiscuous mode, use normal mode. */ /* Disable promiscuous mode, use normal mode. */
IRDA_DEBUG(4, __FUNCTION__ "(), Setting multicast filter\n"); IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
/* hardware_set_filter(NULL); */ /* hardware_set_filter(NULL); */
irlan_set_multicast_filter(self, TRUE); irlan_set_multicast_filter(self, TRUE);
} }
else if (dev->mc_count) { else if (dev->mc_count) {
IRDA_DEBUG(4, __FUNCTION__ "(), Setting multicast filter\n"); IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
/* Walk the address list, and load the filter */ /* Walk the address list, and load the filter */
/* hardware_set_filter(dev->mc_list); */ /* hardware_set_filter(dev->mc_list); */
irlan_set_multicast_filter(self, TRUE); irlan_set_multicast_filter(self, TRUE);
} }
else { else {
IRDA_DEBUG(4, __FUNCTION__ "(), Clearing multicast filter\n"); IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __FUNCTION__ );
irlan_set_multicast_filter(self, FALSE); irlan_set_multicast_filter(self, FALSE);
} }
......
...@@ -40,7 +40,7 @@ char *irlan_state[] = { ...@@ -40,7 +40,7 @@ char *irlan_state[] = {
void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state) void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
{ {
IRDA_DEBUG(2, __FUNCTION__"(), %s\n", irlan_state[state]); IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state) ...@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state) void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
{ {
IRDA_DEBUG(2, __FUNCTION__"(), %s\n", irlan_state[state]); IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
......
...@@ -143,7 +143,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value) ...@@ -143,7 +143,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
{ {
__u8 *bytes; __u8 *bytes;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
bytes = value; bytes = value;
...@@ -156,7 +156,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value) ...@@ -156,7 +156,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
* This is experimental!! DB. * This is experimental!! DB.
*/ */
if (strcmp(param, "MODE") == 0) { if (strcmp(param, "MODE") == 0) {
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
self->use_udata = TRUE; self->use_udata = TRUE;
return; return;
} }
......
...@@ -70,7 +70,7 @@ static int irlan_provider_data_indication(void *instance, void *sap, ...@@ -70,7 +70,7 @@ static int irlan_provider_data_indication(void *instance, void *sap,
struct irlan_cb *self; struct irlan_cb *self;
__u8 code; __u8 code;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
...@@ -99,15 +99,15 @@ static int irlan_provider_data_indication(void *instance, void *sap, ...@@ -99,15 +99,15 @@ static int irlan_provider_data_indication(void *instance, void *sap,
irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb); irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb);
break; break;
case CMD_RECONNECT_DATA_CHAN: case CMD_RECONNECT_DATA_CHAN:
IRDA_DEBUG(2, __FUNCTION__"(), Got RECONNECT_DATA_CHAN command\n"); IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __FUNCTION__ );
IRDA_DEBUG(2, __FUNCTION__"(), NOT IMPLEMENTED\n"); IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ );
break; break;
case CMD_CLOSE_DATA_CHAN: case CMD_CLOSE_DATA_CHAN:
IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n"); IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n");
IRDA_DEBUG(2, __FUNCTION__"(), NOT IMPLEMENTED\n"); IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ );
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown command!\n"); IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ );
break; break;
} }
return 0; return 0;
...@@ -129,7 +129,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap, ...@@ -129,7 +129,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
struct tsap_cb *tsap; struct tsap_cb *tsap;
__u32 saddr, daddr; __u32 saddr, daddr;
IRDA_DEBUG(0, __FUNCTION__ "()\n"); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap; tsap = (struct tsap_cb *) sap;
...@@ -182,7 +182,7 @@ void irlan_provider_disconnect_indication(void *instance, void *sap, ...@@ -182,7 +182,7 @@ void irlan_provider_disconnect_indication(void *instance, void *sap,
struct irlan_cb *self; struct irlan_cb *self;
struct tsap_cb *tsap; struct tsap_cb *tsap;
IRDA_DEBUG(4, __FUNCTION__ "(), reason=%d\n", reason); IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason);
self = (struct irlan_cb *) instance; self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap; tsap = (struct tsap_cb *) sap;
...@@ -236,7 +236,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd, ...@@ -236,7 +236,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;); ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;);
IRDA_DEBUG(4, __FUNCTION__ "(), skb->len=%d\n", (int)skb->len); IRDA_DEBUG(4, "%s(), skb->len=%d\n", __FUNCTION__ , (int)skb->len);
ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;); ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;);
ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;); ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;);
...@@ -266,7 +266,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd, ...@@ -266,7 +266,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
for (i=0; i<count;i++) { for (i=0; i<count;i++) {
ret = irlan_extract_param(ptr, name, value, &val_len); ret = irlan_extract_param(ptr, name, value, &val_len);
if (ret < 0) { if (ret < 0) {
IRDA_DEBUG(2, __FUNCTION__ "(), IrLAN, Error!\n"); IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ );
break; break;
} }
ptr+=ret; ptr+=ret;
...@@ -291,7 +291,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, ...@@ -291,7 +291,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
{ {
struct sk_buff *skb; struct sk_buff *skb;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
ASSERT(self->magic == IRLAN_MAGIC, return;); ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -316,7 +316,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, ...@@ -316,7 +316,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
irlan_insert_string_param(skb, "MEDIA", "802.5"); irlan_insert_string_param(skb, "MEDIA", "802.5");
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), unknown media type!\n"); IRDA_DEBUG(2, "%s(), unknown media type!\n", __FUNCTION__ );
break; break;
} }
irlan_insert_short_param(skb, "IRLAN_VER", 0x0101); irlan_insert_short_param(skb, "IRLAN_VER", 0x0101);
...@@ -340,7 +340,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, ...@@ -340,7 +340,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED"); irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED");
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown access type\n"); IRDA_DEBUG(2, "%s(), Unknown access type\n", __FUNCTION__ );
break; break;
} }
irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee); irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee);
...@@ -361,7 +361,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, ...@@ -361,7 +361,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
handle_filter_request(self, skb); handle_filter_request(self, skb);
break; break;
default: default:
IRDA_DEBUG(2, __FUNCTION__ "(), Unknown command!\n"); IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ );
break; break;
} }
...@@ -379,7 +379,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self) ...@@ -379,7 +379,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
struct tsap_cb *tsap; struct tsap_cb *tsap;
notify_t notify; notify_t notify;
IRDA_DEBUG(4, __FUNCTION__ "()\n"); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;); ASSERT(self->magic == IRLAN_MAGIC, return -1;);
...@@ -400,7 +400,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self) ...@@ -400,7 +400,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
tsap = irttp_open_tsap(LSAP_ANY, 1, &notify); tsap = irttp_open_tsap(LSAP_ANY, 1, &notify);
if (!tsap) { if (!tsap) {
IRDA_DEBUG(2, __FUNCTION__ "(), Got no tsap!\n"); IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
return -1; return -1;
} }
self->provider.tsap_ctrl = tsap; self->provider.tsap_ctrl = tsap;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -326,29 +326,29 @@ ...@@ -326,29 +326,29 @@
* compiler will optimise away the if() in all cases. * compiler will optimise away the if() in all cases.
*/ */
/* All error messages (will show up in the normal logs) */ /* All error messages (will show up in the normal logs) */
#define DERROR(dbg, args...) \ #define DERROR(dbg, format, args...) \
{if(DEBUG_##dbg) \ {if(DEBUG_##dbg) \
printk(KERN_INFO "irnet: " __FUNCTION__ "(): " args);} printk(KERN_INFO "irnet: %s(): " format, __FUNCTION__ , ##args);}
/* Normal debug message (will show up in /var/log/debug) */ /* Normal debug message (will show up in /var/log/debug) */
#define DEBUG(dbg, args...) \ #define DEBUG(dbg, format, args...) \
{if(DEBUG_##dbg) \ {if(DEBUG_##dbg) \
printk(KERN_DEBUG "irnet: " __FUNCTION__ "(): " args);} printk(KERN_DEBUG "irnet: %s(): " format, __FUNCTION__ , ##args);}
/* Entering a function (trace) */ /* Entering a function (trace) */
#define DENTER(dbg, args...) \ #define DENTER(dbg, format, args...) \
{if(DEBUG_##dbg) \ {if(DEBUG_##dbg) \
printk(KERN_DEBUG "irnet: ->" __FUNCTION__ args);} printk(KERN_DEBUG "irnet: -> %s" format, __FUNCTION__ , ##args);}
/* Entering and exiting a function in one go (trace) */ /* Entering and exiting a function in one go (trace) */
#define DPASS(dbg, args...) \ #define DPASS(dbg, format, args...) \
{if(DEBUG_##dbg) \ {if(DEBUG_##dbg) \
printk(KERN_DEBUG "irnet: <>" __FUNCTION__ args);} printk(KERN_DEBUG "irnet: <>%s" format, __FUNCTION__ , ##args);}
/* Exiting a function (trace) */ /* Exiting a function (trace) */
#define DEXIT(dbg, args...) \ #define DEXIT(dbg, format, args...) \
{if(DEBUG_##dbg) \ {if(DEBUG_##dbg) \
printk(KERN_DEBUG "irnet: <-" __FUNCTION__ "()" args);} printk(KERN_DEBUG "irnet: <-%s()" format, __FUNCTION__ , ##args);}
/* Exit a function with debug */ /* Exit a function with debug */
#define DRETURN(ret, dbg, args...) \ #define DRETURN(ret, dbg, args...) \
...@@ -434,7 +434,7 @@ typedef struct irnet_socket ...@@ -434,7 +434,7 @@ typedef struct irnet_socket
/* ------------------- IrLMP and IrIAS part ------------------- */ /* ------------------- IrLMP and IrIAS part ------------------- */
/* Used for IrDA Discovery and socket name resolution */ /* Used for IrDA Discovery and socket name resolution */
__u32 ckey; /* IrLMP client handle */ void * ckey; /* IrLMP client handle */
__u16 mask; /* Hint bits mask (filter discov.)*/ __u16 mask; /* Hint bits mask (filter discov.)*/
int nslots; /* Number of slots for discovery */ int nslots; /* Number of slots for discovery */
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment