leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: usbatm.c: remove dbg() usage

Browse Source 
dbg() was a very old USB-specific macro that should no longer
be used. This patch removes it from being used in the driver
and uses dev_dbg() instead.

CC: Duncan Sands <duncan.sands@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-05-01 21:33:26 -07:00
parent d8995425ff
commit 4c2a47a287
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/atm/usbatm.c
View File

@ -86,7 +86,7 @@
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
static int usbatm_print_packet(const unsigned char *data, int len); static int usbatm_print_packet(const unsigned char *data, int len);
#define PACKETDEBUG(arg...) usbatm_print_packet(arg) #define PACKETDEBUG(arg...) usbatm_print_packet(arg)
#define vdbg(arg...) dbg(arg) #define vdbg(arg...) dev_dbg(arg)
#else #else
#define PACKETDEBUG(arg...) #define PACKETDEBUG(arg...)
#define vdbg(arg...) #define vdbg(arg...)
@ -714,7 +714,7 @@ static void usbatm_destroy_instance(struct kref *kref)
{ {
struct usbatm_data *instance = container_of(kref, struct usbatm_data, refcount); struct usbatm_data *instance = container_of(kref, struct usbatm_data, refcount);
dbg("%s", __func__); usb_dbg(instance, "%s\n", __func__);
tasklet_kill(&instance->rx_channel.tasklet); tasklet_kill(&instance->rx_channel.tasklet);
tasklet_kill(&instance->tx_channel.tasklet); tasklet_kill(&instance->tx_channel.tasklet);
@ -724,14 +724,14 @@ static void usbatm_destroy_instance(struct kref *kref)
static void usbatm_get_instance(struct usbatm_data *instance) static void usbatm_get_instance(struct usbatm_data *instance)
{ {
dbg("%s", __func__); usb_dbg(instance, "%s\n", __func__);
kref_get(&instance->refcount); kref_get(&instance->refcount);
} }
static void usbatm_put_instance(struct usbatm_data *instance) static void usbatm_put_instance(struct usbatm_data *instance)
{ {
dbg("%s", __func__); usb_dbg(instance, "%s\n", __func__);
kref_put(&instance->refcount, usbatm_destroy_instance); kref_put(&instance->refcount, usbatm_destroy_instance);
} }
@ -745,11 +745,10 @@ static void usbatm_atm_dev_close(struct atm_dev *atm_dev)
{ {
struct usbatm_data *instance = atm_dev->dev_data; struct usbatm_data *instance = atm_dev->dev_data;
dbg("%s", __func__);
if (!instance) if (!instance)
return; return;
usb_dbg(instance, "%s\n", __func__);
atm_dev->dev_data = NULL; /* catch bugs */ atm_dev->dev_data = NULL; /* catch bugs */
usbatm_put_instance(instance); /* taken in usbatm_atm_init */ usbatm_put_instance(instance); /* taken in usbatm_atm_init */
} }
@ -759,10 +758,8 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
struct usbatm_data *instance = atm_dev->dev_data; struct usbatm_data *instance = atm_dev->dev_data;
int left = *pos; int left = *pos;
if (!instance) { if (!instance)
dbg("%s: NULL instance!", __func__);
return -ENODEV; return -ENODEV;
}
if (!left--) if (!left--)
return sprintf(page, "%s\n", instance->description); return sprintf(page, "%s\n", instance->description);
@ -804,10 +801,8 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
int vci = vcc->vci; int vci = vcc->vci;
short vpi = vcc->vpi; short vpi = vcc->vpi;
if (!instance) { if (!instance)
dbg("%s: NULL data!", __func__);
return -ENODEV; return -ENODEV;
}
atm_dbg(instance, "%s: vpi %hd, vci %d\n", __func__, vpi, vci); atm_dbg(instance, "%s: vpi %hd, vci %d\n", __func__, vpi, vci);
@ -884,10 +879,8 @@ static void usbatm_atm_close(struct atm_vcc *vcc)
struct usbatm_data *instance = vcc->dev->dev_data; struct usbatm_data *instance = vcc->dev->dev_data;
struct usbatm_vcc_data *vcc_data = vcc->dev_data; struct usbatm_vcc_data *vcc_data = vcc->dev_data;
if (!instance || !vcc_data) { if (!instance || !vcc_data)
dbg("%s: NULL data!", __func__);
return; return;
}
atm_dbg(instance, "%s entered\n", __func__); atm_dbg(instance, "%s entered\n", __func__);
@ -929,10 +922,8 @@ static int usbatm_atm_ioctl(struct atm_dev *atm_dev, unsigned int cmd,
{ {
struct usbatm_data *instance = atm_dev->dev_data; struct usbatm_data *instance = atm_dev->dev_data;
if (!instance || instance->disconnected) { if (!instance || instance->disconnected)
dbg("%s: %s!", __func__, instance ? "disconnected" : "NULL instance");
return -ENODEV; return -ENODEV;
}
switch (cmd) { switch (cmd) {
case ATM_QUERYLOOP: case ATM_QUERYLOOP:
@ -1336,8 +1327,6 @@ EXPORT_SYMBOL_GPL(usbatm_usb_disconnect);
static int __init usbatm_usb_init(void) static int __init usbatm_usb_init(void)
{ {
dbg("%s: driver version %s", __func__, DRIVER_VERSION);
if (sizeof(struct usbatm_control) > FIELD_SIZEOF(struct sk_buff, cb)) { if (sizeof(struct usbatm_control) > FIELD_SIZEOF(struct sk_buff, cb)) {
printk(KERN_ERR "%s unusable with this kernel!\n", usbatm_driver_name); printk(KERN_ERR "%s unusable with this kernel!\n", usbatm_driver_name);
return -EIO; return -EIO;
@ -1357,7 +1346,6 @@ module_init(usbatm_usb_init);
static void __exit usbatm_usb_exit(void) static void __exit usbatm_usb_exit(void)
{ {
dbg("%s", __func__);
} }
module_exit(usbatm_usb_exit); module_exit(usbatm_usb_exit);