aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 00:33:03 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 00:33:03 -0400
commit8b0725c0593871106d24ed94e7a14cf2316cb21d (patch)
tree4d008fa704e73f6ea555a82e888a6adaef797192 /drivers/input/misc
parentc4f0bbcd1d53dc40e2ac56f2ab116f9ba612a8ee (diff)
USB: powermate.c: remove dbg() usage
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: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/powermate.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index 3091b82b1f97..d16717e8e9c4 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -85,6 +85,7 @@ static void powermate_config_complete(struct urb *urb);
85static void powermate_irq(struct urb *urb) 85static void powermate_irq(struct urb *urb)
86{ 86{
87 struct powermate_device *pm = urb->context; 87 struct powermate_device *pm = urb->context;
88 struct device *dev = &pm->input->dev;
88 int retval; 89 int retval;
89 90
90 switch (urb->status) { 91 switch (urb->status) {
@@ -95,10 +96,12 @@ static void powermate_irq(struct urb *urb)
95 case -ENOENT: 96 case -ENOENT:
96 case -ESHUTDOWN: 97 case -ESHUTDOWN:
97 /* this urb is terminated, clean up */ 98 /* this urb is terminated, clean up */
98 dbg("%s - urb shutting down with status: %d", __func__, urb->status); 99 dev_dbg(dev, "%s - urb shutting down with status: %d\n",
100 __func__, urb->status);
99 return; 101 return;
100 default: 102 default:
101 dbg("%s - nonzero urb status received: %d", __func__, urb->status); 103 dev_dbg(dev, "%s - nonzero urb status received: %d\n",
104 __func__, urb->status);
102 goto exit; 105 goto exit;
103 } 106 }
104 107
@@ -110,8 +113,7 @@ static void powermate_irq(struct urb *urb)
110exit: 113exit:
111 retval = usb_submit_urb (urb, GFP_ATOMIC); 114 retval = usb_submit_urb (urb, GFP_ATOMIC);
112 if (retval) 115 if (retval)
113 dev_err(&pm->input->dev, 116 dev_err(dev, "%s - usb_submit_urb failed with result: %d\n",
114 "%s - usb_submit_urb failed with result: %d\n",
115 __func__, retval); 117 __func__, retval);
116} 118}
117 119