Re: [PATCH] staging/comedi: Use pr_ or dev_ printks in drivers/gsc_hdpi.c

[Greg Kroah-Hartman <greg@kroah.com>]

On Wed, Oct 10, 2012 at 09:20:59PM +0900, YAMANE Toshiaki wrote:
> fixed below checkpatch warning.
> - WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...
> 
> and added pr_fmt.
> 
> Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
> ---
>  drivers/staging/comedi/drivers/gsc_hpdi.c |   31 +++++++++++++++--------------
>  1 file changed, 16 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
> index abff660..30a27fd 100644
> --- a/drivers/staging/comedi/drivers/gsc_hpdi.c
> +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
> @@ -45,6 +45,8 @@ support could be added to this driver.
>  
>  */
>  
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
>  #include <linux/interrupt.h>
>  #include "../comedidev.h"
>  #include <linux/delay.h>
> @@ -107,8 +109,7 @@ enum hpdi_registers {
>  int command_channel_valid(unsigned int channel)
>  {
>  	if (channel == 0 || channel > 6) {
> -		printk(KERN_WARNING
> -		       "gsc_hpdi: bug! invalid cable command channel\n");
> +		pr_warn("bug! invalid cable command channel\n");
>  		return 0;
>  	}
>  	return 1;
> @@ -553,7 +554,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  	int i;
>  	int retval;
>  
> -	printk(KERN_WARNING "comedi%d: gsc_hpdi\n", dev->minor);
> +	dev_warn(dev->class_dev, "gsc_hpdi\n");

What is this warning about?

>  
>  	if (alloc_private(dev, sizeof(struct hpdi_private)) < 0)
>  		return -ENOMEM;
> @@ -582,17 +583,17 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  		} while (pcidev != NULL);
>  	}
>  	if (dev->board_ptr == NULL) {
> -		printk(KERN_WARNING "gsc_hpdi: no hpdi card found\n");
> +		dev_warn(dev->class_dev, "no hpdi card found\n");
>  		return -EIO;
>  	}
>  
> -	printk(KERN_WARNING
> -	       "gsc_hpdi: found %s on bus %i, slot %i\n", board(dev)->name,
> -	       pcidev->bus->number, PCI_SLOT(pcidev->devfn));
> +	dev_warn(dev->class_dev,
> +		 "found %s on bus %i, slot %i\n", board(dev)->name,
> +		 pcidev->bus->number, PCI_SLOT(pcidev->devfn));
>  
>  	if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
> -		printk(KERN_WARNING
> -		       " failed enable PCI device and request regions\n");
> +		dev_warn(dev->class_dev,
> +			 " failed enable PCI device and request regions\n");
>  		return -EIO;
>  	}
>  	pci_set_master(pcidev);
> @@ -613,7 +614,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  	    ioremap(priv(dev)->hpdi_phys_iobase,
>  		    pci_resource_len(pcidev, HPDI_BADDRINDEX));
>  	if (!priv(dev)->plx9080_iobase || !priv(dev)->hpdi_iobase) {
> -		printk(KERN_WARNING " failed to remap io memory\n");
> +		dev_warn(dev->class_dev, "failed to remap io memory\n");
>  		return -ENOMEM;
>  	}
>  
> @@ -625,13 +626,13 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  	/*  get irq */
>  	if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
>  			dev->driver->driver_name, dev)) {
> -		printk(KERN_WARNING
> -		       " unable to allocate irq %u\n", pcidev->irq);
> +		dev_warn(dev->class_dev,
> +			 "unable to allocate irq %u\n", pcidev->irq);
>  		return -EINVAL;
>  	}
>  	dev->irq = pcidev->irq;
>  
> -	printk(KERN_WARNING " irq %u\n", dev->irq);
> +	dev_warn(dev->class_dev, "irq %u\n", dev->irq);

Again a warning?  Shouldn't most of these be debugging lines instead?

greg k-h