This is a patch to the vmk80xx.c file that replaces the printk with dev_dbg.
This fixes the warnings found by the checkpatch.pl tool.
Signed-off-by: Arpith Easow Alexander <[email protected]>
---
drivers/staging/comedi/drivers/vmk80xx.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index df277aa..6eb5361 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -131,10 +131,10 @@ static int dbgcm = 1;
static int dbgcm;
#endif
-#define dbgcm(fmt, arg...) \
+#define dbgcm(dev, fmt, arg...) \
do { \
if (dbgcm) \
- printk(KERN_DEBUG fmt, ##arg); \
+ dev_dbg(dev, fmt, ##arg); \
} while (0)
enum vmk80xx_model {
@@ -213,8 +213,9 @@ static void vmk80xx_tx_callback(struct urb *urb)
if (stat && !(stat == -ENOENT
|| stat == -ECONNRESET || stat == -ESHUTDOWN))
- dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
- __func__, stat);
+ dbgcm(&(dev->udev->dev),
+ "comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
+ __func__, stat);
if (!test_bit(TRANS_OUT_BUSY, &dev->flags))
return;
@@ -237,7 +238,8 @@ static void vmk80xx_rx_callback(struct urb *urb)
case -ESHUTDOWN:
break;
default:
- dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
+ dbgcm(&(dev->udev->dev),
+ "comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
__func__, stat);
goto resubmit;
}
@@ -1371,14 +1373,16 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
if (dev->board.model == VMK8061_MODEL) {
vmk80xx_read_eeprom(dev, IC3_VERSION);
- printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+ dev_dbg(&(dev->udev->dev),
+ "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
if (vmk80xx_check_data_link(dev)) {
vmk80xx_read_eeprom(dev, IC6_VERSION);
- printk(KERN_INFO "comedi#: vmk80xx: %s\n",
+ dev_dbg(&(dev->udev->dev), "comedi#: vmk80xx: %s\n",
dev->fw.ic6_vers);
} else {
- dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
+ dbgcm(&(dev->udev->dev),
+ "comedi#: vmk80xx: no conn. to CPU\n");
}
}
@@ -1387,8 +1391,9 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
dev->probed = 1;
- printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
- dev->count, dev->board.name);
+ dev_dbg(&(dev->udev->dev),
+ "comedi#: vmk80xx: board #%d [%s] now attached\n",
+ dev->count, dev->board.name);
mutex_unlock(&glb_mutex);
@@ -1422,8 +1427,9 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
kfree(dev->usb_rx_buf);
kfree(dev->usb_tx_buf);
- printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
- dev->count, dev->board.name);
+ dev_dbg(&(dev->udev->dev),
+ "comedi#: vmk80xx: board #%d [%s] now detached\n",
+ dev->count, dev->board.name);
up(&dev->limit_sem);
mutex_unlock(&glb_mutex);
--
1.7.9.5
On Sat, Nov 10, 2012 at 12:38:38PM +0530, Arpith Easow Alexander wrote:
> This is a patch to the vmk80xx.c file that replaces the printk with dev_dbg.
> This fixes the warnings found by the checkpatch.pl tool.
>
> Signed-off-by: Arpith Easow Alexander <[email protected]>
> ---
> drivers/staging/comedi/drivers/vmk80xx.c | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
> index df277aa..6eb5361 100644
> --- a/drivers/staging/comedi/drivers/vmk80xx.c
> +++ b/drivers/staging/comedi/drivers/vmk80xx.c
> @@ -131,10 +131,10 @@ static int dbgcm = 1;
> static int dbgcm;
> #endif
>
> -#define dbgcm(fmt, arg...) \
> +#define dbgcm(dev, fmt, arg...) \
> do { \
> if (dbgcm) \
> - printk(KERN_DEBUG fmt, ##arg); \
> + dev_dbg(dev, fmt, ##arg); \
So a macro called dbgcm tests a variable called dbgcm? Gotta love c at
times...
Just delete the macro, and the variable, and call dev_dbg() directly
please.
thanks.
greg k-h
On Tue, Nov 13, 2012 at 11:52:52AM -0800, Greg KH wrote:
> On Sat, Nov 10, 2012 at 12:38:38PM +0530, Arpith Easow Alexander wrote:
> > This is a patch to the vmk80xx.c file that replaces the printk with dev_dbg.
> > This fixes the warnings found by the checkpatch.pl tool.
> >
> > Signed-off-by: Arpith Easow Alexander <[email protected]>
> > ---
> > drivers/staging/comedi/drivers/vmk80xx.c | 30 ++++++++++++++++++------------
> > 1 file changed, 18 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
> > index df277aa..6eb5361 100644
> > --- a/drivers/staging/comedi/drivers/vmk80xx.c
> > +++ b/drivers/staging/comedi/drivers/vmk80xx.c
> > @@ -131,10 +131,10 @@ static int dbgcm = 1;
> > static int dbgcm;
> > #endif
> >
> > -#define dbgcm(fmt, arg...) \
> > +#define dbgcm(dev, fmt, arg...) \
> > do { \
> > if (dbgcm) \
> > - printk(KERN_DEBUG fmt, ##arg); \
> > + dev_dbg(dev, fmt, ##arg); \
>
> So a macro called dbgcm tests a variable called dbgcm? Gotta love c at
> times...
>
> Just delete the macro, and the variable, and call dev_dbg() directly
> please.
Ok. Done. (Attached both changes).
Thanks,
Arpith
On Thursday, November 15, 2012 9:28 AM, Arpith Easow Alexander wrote:
> On Tue, Nov 13, 2012 at 11:52:52AM -0800, Greg KH wrote:
>> So a macro called dbgcm tests a variable called dbgcm? Gotta love c at
>> times...
>>
>> Just delete the macro, and the variable, and call dev_dbg() directly
>> please.
>
> Ok. Done. (Attached both changes).
Arpith,
You have two patches attached to this message. Please repost them patch as
[PATCH v2 1/2] and [PATCH v2 2/2] and include the patches inline. It makes
them easier to review and apply.
Thanks!
Hartley
On Thu, Nov 15, 2012 at 09:57:42PM +0530, Arpith Easow Alexander wrote:
> On Tue, Nov 13, 2012 at 11:52:52AM -0800, Greg KH wrote:
> > On Sat, Nov 10, 2012 at 12:38:38PM +0530, Arpith Easow Alexander wrote:
> > > This is a patch to the vmk80xx.c file that replaces the printk with dev_dbg.
> > > This fixes the warnings found by the checkpatch.pl tool.
> > >
> > > Signed-off-by: Arpith Easow Alexander <[email protected]>
> > > ---
> > > drivers/staging/comedi/drivers/vmk80xx.c | 30 ++++++++++++++++++------------
> > > 1 file changed, 18 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
> > > index df277aa..6eb5361 100644
> > > --- a/drivers/staging/comedi/drivers/vmk80xx.c
> > > +++ b/drivers/staging/comedi/drivers/vmk80xx.c
> > > @@ -131,10 +131,10 @@ static int dbgcm = 1;
> > > static int dbgcm;
> > > #endif
> > >
> > > -#define dbgcm(fmt, arg...) \
> > > +#define dbgcm(dev, fmt, arg...) \
> > > do { \
> > > if (dbgcm) \
> > > - printk(KERN_DEBUG fmt, ##arg); \
> > > + dev_dbg(dev, fmt, ##arg); \
> >
> > So a macro called dbgcm tests a variable called dbgcm? Gotta love c at
> > times...
> >
> > Just delete the macro, and the variable, and call dev_dbg() directly
> > please.
>
> Ok. Done. (Attached both changes).
As Hartley pointed out, I can't take patches as attachments, one per
email please.
thanks,
greg k-h