On Tue, Oct 09, 2012 at 10:07:52PM +0900, YAMANE Toshiaki wrote: > fixed below checkpatch warnings. > - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then > pr_err(... to printk(KERN_ERR ... > - WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then > pr_info(... to printk(KERN_INFO ... > > and added pr_fmt. > > Signed-off-by: YAMANE Toshiaki <[email protected]> > --- > drivers/staging/comedi/drivers/unioxx5.c | 45 > +++++++++++++++--------------- > 1 file changed, 23 insertions(+), 22 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/unioxx5.c > b/drivers/staging/comedi/drivers/unioxx5.c > index 9f1fdec..b5e58f5 100644 > --- a/drivers/staging/comedi/drivers/unioxx5.c > +++ b/drivers/staging/comedi/drivers/unioxx5.c > @@ -42,6 +42,8 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5), > > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > #include "../comedidev.h" > #include <linux/ioport.h> > #include <linux/slab.h> > @@ -144,8 +146,7 @@ static int __unioxx5_digital_read(struct > unioxx5_subd_priv *usp, > > channel_offset = __unioxx5_define_chan_offset(channel); > if (channel_offset < 0) { > - printk(KERN_ERR > - "comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > + pr_err("comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > minor, channel); > return 0; > } > @@ -171,8 +172,7 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv > *usp, > > /* defining if given module can work on input */ > if (usp->usp_module_type[module_no] & MODULE_OUTPUT_MASK) { > - printk(KERN_ERR > - "comedi%d: module in position %d with id 0x%02x is for > output only", > + pr_err("comedi%d: module in position %d with id 0x%02x is for > output only", > minor, module_no, usp->usp_module_type[module_no]); > return 0; > } > @@ -209,8 +209,7 @@ static int __unioxx5_digital_write(struct > unioxx5_subd_priv *usp, > > channel_offset = __unioxx5_define_chan_offset(channel); > if (channel_offset < 0) { > - printk(KERN_ERR > - "comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > + pr_err("comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > minor, channel); > return 0; > } > @@ -240,8 +239,7 @@ static int __unioxx5_analog_write(struct > unioxx5_subd_priv *usp, > > /* defining if given module can work on output */ > if (!(usp->usp_module_type[module] & MODULE_OUTPUT_MASK)) { > - printk(KERN_ERR > - "comedi%d: module in position %d with id 0x%0x is for > input only!\n", > + pr_err("comedi%d: module in position %d with id 0x%0x is for > input only!\n", > minor, module, usp->usp_module_type[module]); > return 0; > } > @@ -323,17 +321,17 @@ static int unioxx5_insn_config(struct comedi_device > *dev, > type = usp->usp_module_type[channel / 2]; > > if (type != MODULE_DIGITAL) { > - printk(KERN_ERR > - "comedi%d: channel configuration accessible only for > digital modules\n", > - dev->minor); > + dev_err(dev->class_dev, > + "comedi%d: channel configuration accessible only for > digital modules\n", > + dev->minor); > return -1; > } > > channel_offset = __unioxx5_define_chan_offset(channel); > if (channel_offset < 0) { > - printk(KERN_ERR > - "comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > - dev->minor, channel); > + dev_err(dev->class_dev, > + "comedi%d: undefined channel %d. channel range is 0 .. > 23\n", > + dev->minor, channel); > return -1; > } > > @@ -348,7 +346,8 @@ static int unioxx5_insn_config(struct comedi_device *dev, > flags |= mask; > break; > default: > - printk(KERN_ERR "comedi%d: unknown flag\n", dev->minor); > + dev_err(dev->class_dev, > + "comedi%d: unknown flag\n", dev->minor); > return -1; > } > > @@ -375,19 +374,21 @@ static int __unioxx5_subdev_init(struct > comedi_subdevice *subdev, > int i, to, ndef_flag = 0; > > if (!request_region(subdev_iobase, UNIOXX5_SIZE, DRIVER_NAME)) { > - printk(KERN_ERR "comedi%d: I/O port conflict\n", minor); > + dev_err(subdev->class_dev, > + "comedi%d: I/O port conflict\n", minor); > return -EIO; > } > > usp = kzalloc(sizeof(*usp), GFP_KERNEL); > > if (usp == NULL) { > - printk(KERN_ERR "comedi%d: error! --> out of memory!\n", minor); > + dev_err(subdev->class_dev, > + "comedi%d: error! --> out of memory!\n", minor); > return -1; > } > > usp->usp_iobase = subdev_iobase; > - printk(KERN_INFO "comedi%d: |", minor); > + dev_info(subdev->class_dev, "comedi%d: |", minor); > > /* defining modules types */ > for (i = 0; i < 12; i++) { > @@ -433,7 +434,7 @@ static int __unioxx5_subdev_init(struct comedi_subdevice > *subdev, > /* for digital modules only!!! */ > subdev->insn_config = unioxx5_insn_config; > > - printk(KERN_INFO "subdevice configured\n"); > + dev_info(subdev->class_dev, "subdevice configured\n"); > > return 0; > } > @@ -464,8 +465,8 @@ static int unioxx5_attach(struct comedi_device *dev, > > /* unioxx5 can has from two to four subdevices */ > if (n_subd < 2) { > - printk(KERN_ERR > - "your card must has at least 2 'g01' subdevices\n"); > + dev_err(dev->class_dev, > + "your card must has at least 2 'g01' subdevices\n"); > return -1; > } > > @@ -480,7 +481,7 @@ static int unioxx5_attach(struct comedi_device *dev, > return -1; > } > > - printk(KERN_INFO "attached\n"); > + dev_info(dev->class_dev, "attached\n"); > return 0;
Some of these are "debug" type information (configured and attached messages?) Plese just drop them entirely, they aren't needed. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
