From: andy zaugg <andy.zaugg@xxxxxxxxx> --- drivers/staging/comedi/drivers/ni_labpc.c | 37 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 5334977..807a774 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -37,7 +37,7 @@ boards has not yet been added to the driver, mainly due to the fact that I don't know the device id numbers. If you have one of these boards, -please file a bug report at http://comedi.org/ +please file a bug report at http://comedi.org/ so I can get the necessary information from you. The 1200 series boards have onboard calibration dacs for correcting @@ -537,7 +537,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, #endif short lsb, msb; - printk(KERN_ERR "comedi%d: ni_labpc: %s, io 0x%lx", dev->minor, + pr_err(KERN_ERR "comedi%d: ni_labpc: %s, io 0x%lx", dev->minor, thisboard->name, iobase); if (irq) @@ -547,7 +547,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, printk("\n"); if (iobase == 0) { - printk(KERN_ERR "io base address is zero!\n"); + pr_err(KERN_ERR "io base address is zero!\n"); return -EINVAL; } /* request io regions for isa boards */ @@ -555,7 +555,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, /* check if io addresses are available */ if (!request_region(iobase, LABPC_SIZE, driver_labpc.driver_name)) { - printk(KERN_ERR "I/O port conflict\n"); + pr_err(KERN_ERR "I/O port conflict\n"); return -EIO; } } @@ -588,7 +588,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, isr_flags |= IRQF_SHARED; if (request_irq(irq, labpc_interrupt, isr_flags, driver_labpc.driver_name, dev)) { - printk(KERN_ERR "unable to allocate irq %u\n", irq); + pr_err(KERN_ERR "unable to allocate irq %u\n", irq); return -EINVAL; } } @@ -597,18 +597,18 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, #ifdef CONFIG_ISA_DMA_API /* grab dma channel */ if (dma_chan > 3) { - printk(KERN_ERR " invalid dma channel %u\n", dma_chan); + pr_err(KERN_ERR " invalid dma channel %u\n", dma_chan); return -EINVAL; } else if (dma_chan) { /* allocate dma buffer */ devpriv->dma_buffer = kmalloc(dma_buffer_size, GFP_KERNEL | GFP_DMA); if (devpriv->dma_buffer == NULL) { - printk(KERN_ERR " failed to allocate dma buffer\n"); + pr_err(KERN_ERR " failed to allocate dma buffer\n"); return -ENOMEM; } if (request_dma(dma_chan, driver_labpc.driver_name)) { - printk(KERN_ERR " failed to allocate dma channel %u\n", + pr_err(KERN_ERR " failed to allocate dma channel %u\n", dma_chan); return -EINVAL; } @@ -705,7 +705,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, for (i = 0; i < EEPROM_SIZE; i++) devpriv->eeprom_data[i] = labpc_eeprom_read(dev, i); #ifdef LABPC_DEBUG - printk(KERN_ERR " eeprom:"); + pr_err(KERN_ERR " eeprom:"); for (i = 0; i < EEPROM_SIZE; i++) printk(" %i:0x%x ", i, devpriv->eeprom_data[i]); printk("\n"); @@ -738,8 +738,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) irq = it->options[1]; dma_chan = it->options[2]; #else - printk(KERN_ERR " this driver has not been built with ISA DMA " - "support.\n"); + pr_err(KERN_ERR " this driver has not been built with ISA DMA support.\n"); return -EINVAL; #endif break; @@ -754,8 +753,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) iobase = (unsigned long)devpriv->mite->daq_io_addr; irq = mite_irq(devpriv->mite); #else - printk(KERN_ERR " this driver has not been built with PCI " - "support.\n"); + pr_err(KERN_ERR " this driver has not been built with PCI support.\n"); return -EINVAL; #endif break; @@ -765,7 +763,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -EINVAL; break; default: - printk(KERN_ERR "bug! couldn't determine board type\n"); + pr_err(KERN_ERR "bug! couldn't determine board type\n"); return -EINVAL; break; } @@ -799,7 +797,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot) } } } - printk(KERN_ERR "no device found\n"); + pr_err(KERN_ERR "no device found\n"); mite_list_devices(); return -EIO; } @@ -866,7 +864,7 @@ static enum scan_mode labpc_ai_scan_mode(const struct comedi_cmd *cmd) if (CR_CHAN(cmd->chanlist[0]) > CR_CHAN(cmd->chanlist[1])) return MODE_MULT_CHAN_DOWN; - printk(KERN_ERR "ni_labpc: bug! this should never happen\n"); + pr_err(KERN_ERR "ni_labpc: bug! this should never happen\n"); return 0; } @@ -922,7 +920,7 @@ static int labpc_ai_chanlist_invalid(const struct comedi_device *dev, } break; default: - printk(KERN_ERR "ni_labpc: bug! in chanlist check\n"); + pr_err(KERN_ERR "ni_labpc: bug! in chanlist check\n"); return 1; break; } @@ -1044,7 +1042,10 @@ static int labpc_ai_cmdtest(struct comedi_device *dev, if (err) return 1; - /* step 2: make sure trigger sources are unique and mutually compatible */ + /* + step 2: + make sure trigger sources are unique and mutually compatible + */ if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) err++; -- 1.7.9.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
