[PATCH] isdn4linux: Siemens Gigaset drivers: logging usage

With Hansjoerg Lipp <hjlipp@web.de>

Improve error reporting of the Gigaset drivers, by using the
dev_err/dev_warn/dev_info macros from device.h instead of err/warn/info from
usb.h whereever possible.

Also rename the private dbg macro to gig_dbg in order to avoid confusion with
the macro of the same name in usb.h.

Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index c30ea80d517a..695495ad0668 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -44,13 +44,13 @@ static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
 
         cs->waiting = 1;
         if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
-                               NULL, value, NULL)) {
+                               NULL, value, NULL)) {
                 cs->waiting = 0;
                 up(&cs->sem);
                 return -ENOMEM;
         }
 
-        dbg(DEBUG_CMD, "scheduling PROC_CIDMODE");
+        gig_dbg(DEBUG_CMD, "scheduling PROC_CIDMODE");
         gigaset_schedule_event(cs);
 
         wait_event(cs->waitqueue, !cs->waiting);
@@ -65,7 +65,7 @@ static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 /* free sysfs for device */
 void gigaset_free_dev_sysfs(struct usb_interface *interface)
 {
-        dbg(DEBUG_INIT, "removing sysfs entries");
+        gig_dbg(DEBUG_INIT, "removing sysfs entries");
         device_remove_file(&interface->dev, &dev_attr_cidmode);
 }
 EXPORT_SYMBOL_GPL(gigaset_free_dev_sysfs);
@@ -73,7 +73,7 @@ EXPORT_SYMBOL_GPL(gigaset_free_dev_sysfs);
 /* initialize sysfs for device */
 void gigaset_init_dev_sysfs(struct usb_interface *interface)
 {
-        dbg(DEBUG_INIT, "setting up sysfs");
+        gig_dbg(DEBUG_INIT, "setting up sysfs");
         device_create_file(&interface->dev, &dev_attr_cidmode);
 }
 EXPORT_SYMBOL_GPL(gigaset_init_dev_sysfs);