diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-18 16:21:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:09 -0400 |
commit | 1b29a375fb0b79a11a2d18e7bf5f6da422a35025 (patch) | |
tree | b33ff37280cbf8d3bd37e4470b166a23c007eca8 /drivers/usb/misc/rio500.c | |
parent | c197a8db59daf06dc5e77acd5a9681329cb22458 (diff) |
USB: remove info() macro from usb/misc drivers
USB should not be having it's own printk macros, so remove info() and
use the system-wide standard of dev_info() wherever possible.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/rio500.c')
-rw-r--r-- | drivers/usb/misc/rio500.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index 248a12aacef6..deb95bb49fd1 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c | |||
@@ -89,7 +89,7 @@ static int open_rio(struct inode *inode, struct file *file) | |||
89 | 89 | ||
90 | mutex_unlock(&(rio->lock)); | 90 | mutex_unlock(&(rio->lock)); |
91 | 91 | ||
92 | info("Rio opened."); | 92 | dev_info(&rio->rio_dev->dev, "Rio opened.\n"); |
93 | 93 | ||
94 | return 0; | 94 | return 0; |
95 | } | 95 | } |
@@ -100,7 +100,7 @@ static int close_rio(struct inode *inode, struct file *file) | |||
100 | 100 | ||
101 | rio->isopen = 0; | 101 | rio->isopen = 0; |
102 | 102 | ||
103 | info("Rio closed."); | 103 | dev_info(&rio->rio_dev->dev, "Rio closed.\n"); |
104 | return 0; | 104 | return 0; |
105 | } | 105 | } |
106 | 106 | ||
@@ -451,7 +451,7 @@ static int probe_rio(struct usb_interface *intf, | |||
451 | struct rio_usb_data *rio = &rio_instance; | 451 | struct rio_usb_data *rio = &rio_instance; |
452 | int retval; | 452 | int retval; |
453 | 453 | ||
454 | info("USB Rio found at address %d", dev->devnum); | 454 | dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum); |
455 | 455 | ||
456 | retval = usb_register_dev(intf, &usb_rio_class); | 456 | retval = usb_register_dev(intf, &usb_rio_class); |
457 | if (retval) { | 457 | if (retval) { |
@@ -503,7 +503,7 @@ static void disconnect_rio(struct usb_interface *intf) | |||
503 | kfree(rio->ibuf); | 503 | kfree(rio->ibuf); |
504 | kfree(rio->obuf); | 504 | kfree(rio->obuf); |
505 | 505 | ||
506 | info("USB Rio disconnected."); | 506 | dev_info(&intf->dev, "USB Rio disconnected.\n"); |
507 | 507 | ||
508 | rio->present = 0; | 508 | rio->present = 0; |
509 | mutex_unlock(&(rio->lock)); | 509 | mutex_unlock(&(rio->lock)); |
@@ -531,7 +531,8 @@ static int __init usb_rio_init(void) | |||
531 | if (retval) | 531 | if (retval) |
532 | goto out; | 532 | goto out; |
533 | 533 | ||
534 | info(DRIVER_VERSION ":" DRIVER_DESC); | 534 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
535 | DRIVER_DESC "\n"); | ||
535 | 536 | ||
536 | out: | 537 | out: |
537 | return retval; | 538 | return retval; |