Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/comedi/drivers/8255.c | 4 +-
drivers/staging/comedi/drivers/acl7225b.c | 4 +-
drivers/staging/comedi/drivers/adl_pci6208.c | 14 +-
drivers/staging/comedi/drivers/adl_pci7296.c | 8 +-
drivers/staging/comedi/drivers/adl_pci7432.c | 8 +-
drivers/staging/comedi/drivers/adl_pci8164.c | 8 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 14 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 12 +-
drivers/staging/comedi/drivers/adq12b.c | 8 +-
drivers/staging/comedi/drivers/adv_pci1710.c | 12 +-
drivers/staging/comedi/drivers/adv_pci1723.c | 4 +-
drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
drivers/staging/comedi/drivers/amplc_dio200.c | 32 ++--
drivers/staging/comedi/drivers/amplc_pc236.c | 42 ++---
drivers/staging/comedi/drivers/amplc_pc263.c | 33 ++--
drivers/staging/comedi/drivers/amplc_pci224.c | 54 ++---
drivers/staging/comedi/drivers/amplc_pci230.c | 34 ++--
drivers/staging/comedi/drivers/c6xdigio.c | 10 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 6 +-
drivers/staging/comedi/drivers/cb_pcidas.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +-
drivers/staging/comedi/drivers/cb_pcidda.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidio.c | 4 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 4 +-
drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +-
drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
drivers/staging/comedi/drivers/comedi_parport.c | 16 +-
drivers/staging/comedi/drivers/comedi_test.c | 5 +-
drivers/staging/comedi/drivers/contec_pci_dio.c | 27 ++--
drivers/staging/comedi/drivers/daqboard2000.c | 4 +-
drivers/staging/comedi/drivers/das08.c | 6 +-
drivers/staging/comedi/drivers/das08_cs.c | 4 +-
drivers/staging/comedi/drivers/das16.c | 4 +-
drivers/staging/comedi/drivers/das16m1.c | 4 +-
drivers/staging/comedi/drivers/das1800.c | 4 +-
drivers/staging/comedi/drivers/das6402.c | 2 +-
drivers/staging/comedi/drivers/das800.c | 4 +-
drivers/staging/comedi/drivers/dmm32at.c | 40 ++--
drivers/staging/comedi/drivers/dt2811.c | 4 +-
drivers/staging/comedi/drivers/dt2814.c | 4 +-
drivers/staging/comedi/drivers/dt2815.c | 4 +-
drivers/staging/comedi/drivers/dt2817.c | 4 +-
drivers/staging/comedi/drivers/dt282x.c | 4 +-
drivers/staging/comedi/drivers/dt9812.c | 4 +-
drivers/staging/comedi/drivers/fl512.c | 15 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +-
drivers/staging/comedi/drivers/ii_pci20kc.c | 12 +-
drivers/staging/comedi/drivers/jr3_pci.c | 4 +-
drivers/staging/comedi/drivers/ke_counter.c | 10 +-
drivers/staging/comedi/drivers/me4000.c | 253 ++++++++--------------
drivers/staging/comedi/drivers/me4000.h | 8 +-
drivers/staging/comedi/drivers/me_daq.c | 22 +-
drivers/staging/comedi/drivers/mpc624.c | 4 +-
drivers/staging/comedi/drivers/mpc8260cpm.c | 4 +-
drivers/staging/comedi/drivers/multiq3.c | 10 +-
drivers/staging/comedi/drivers/ni_6527.c | 2 +-
drivers/staging/comedi/drivers/ni_65xx.c | 2 +-
drivers/staging/comedi/drivers/ni_660x.c | 4 +-
drivers/staging/comedi/drivers/ni_670x.c | 4 +-
drivers/staging/comedi/drivers/ni_at_a2150.c | 4 +-
drivers/staging/comedi/drivers/ni_at_ao.c | 4 +-
drivers/staging/comedi/drivers/ni_atmio.c | 2 +-
drivers/staging/comedi/drivers/ni_atmio16d.c | 37 ++--
drivers/staging/comedi/drivers/ni_daq_700.c | 14 +-
drivers/staging/comedi/drivers/ni_daq_dio24.c | 44 ++--
drivers/staging/comedi/drivers/ni_labpc.c | 4 +-
drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +-
drivers/staging/comedi/drivers/ni_mio_cs.c | 54 +++---
drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
drivers/staging/comedi/drivers/ni_pcimio.c | 2 +-
drivers/staging/comedi/drivers/pcl711.c | 6 +-
drivers/staging/comedi/drivers/pcl724.c | 4 +-
drivers/staging/comedi/drivers/pcl725.c | 4 +-
drivers/staging/comedi/drivers/pcl726.c | 4 +-
drivers/staging/comedi/drivers/pcl730.c | 4 +-
drivers/staging/comedi/drivers/pcl812.c | 10 +-
drivers/staging/comedi/drivers/pcl816.c | 8 +-
drivers/staging/comedi/drivers/pcl818.c | 8 +-
drivers/staging/comedi/drivers/pcm3724.c | 2 +-
drivers/staging/comedi/drivers/pcm3730.c | 4 +-
drivers/staging/comedi/drivers/pcmad.c | 10 +-
drivers/staging/comedi/drivers/pcmda12.c | 4 +-
drivers/staging/comedi/drivers/pcmmio.c | 4 +-
drivers/staging/comedi/drivers/pcmuio.c | 38 ++--
drivers/staging/comedi/drivers/poc.c | 4 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 63 +++----
drivers/staging/comedi/drivers/rtd520.c | 6 +-
drivers/staging/comedi/drivers/rti800.c | 4 +-
drivers/staging/comedi/drivers/rti802.c | 4 +-
drivers/staging/comedi/drivers/s526.c | 4 +-
drivers/staging/comedi/drivers/s626.c | 2 +-
drivers/staging/comedi/drivers/serial2002.c | 4 +-
drivers/staging/comedi/drivers/skel.c | 4 +-
drivers/staging/comedi/drivers/ssv_dnp.c | 4 +-
drivers/staging/comedi/drivers/unioxx5.c | 31 +--
drivers/staging/comedi/drivers/usbdux.c | 95 ++++-----
drivers/staging/comedi/drivers/usbduxfast.c | 162 ++++++---------
drivers/staging/comedi/drivers/vmk80xx.c | 17 +-
99 files changed, 692 insertions(+), 844 deletions(-)
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 0a50864..582359e 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -392,7 +392,7 @@ static int dev_8255_attach(struct comedi_device *dev,
unsigned long iobase;
int i;
- printk("comedi%d: 8255:", dev->minor);
+ printk("%d: 8255:", dev->minor);
dev->board_name = "8255";
@@ -435,7 +435,7 @@ static int dev_8255_detach(struct comedi_device *dev)
unsigned long iobase;
struct comedi_subdevice *s;
- printk("comedi%d: 8255: remove\n", dev->minor);
+ printk("%d: 8255: remove\n", dev->minor);
for (i = 0; i < dev->n_subdevices; i++) {
s = dev->subdevices + i;
diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index c3652ef..b3b0fd1 100644
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -94,7 +94,7 @@ static int acl7225b_attach(struct comedi_device *dev,
iobase = it->options[0];
iorange = this_board->io_range;
- printk("comedi%d: acl7225b: board=%s 0x%04x ", dev->minor,
+ printk("%d: acl7225b: board=%s 0x%04x ", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, iorange, "acl7225b")) {
printk("I/O port conflict\n");
@@ -144,7 +144,7 @@ static int acl7225b_attach(struct comedi_device *dev,
static int acl7225b_detach(struct comedi_device *dev)
{
- printk("comedi%d: acl7225b: remove\n", dev->minor);
+ printk("%d: acl7225b: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, this_board->io_range);
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 8e1befc..8839c13 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -151,7 +151,7 @@ static int pci6208_attach(struct comedi_device *dev,
int retval;
unsigned long io_base;
- printk("comedi%d: pci6208: ", dev->minor);
+ printk("%d: pci6208: ", dev->minor);
retval = alloc_private(dev, sizeof(struct pci6208_private));
if (retval < 0)
@@ -210,7 +210,7 @@ static int pci6208_attach(struct comedi_device *dev,
*/
static int pci6208_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci6208: remove\n", dev->minor);
+ printk("%d: pci6208: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase) {
@@ -338,12 +338,12 @@ static int pci6208_find_device(struct comedi_device *dev, int bus, int slot)
}
}
- printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return -EIO;
found:
- printk("comedi%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
+ printk("%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
dev->minor,
pci6208_boards[i].name,
pci_dev->bus->number,
@@ -369,7 +369,7 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
/* Enable PCI device and request regions */
if (comedi_pci_enable(pci_dev, PCI6208_DRIVER_NAME) < 0) {
printk
- ("comedi%d: Failed to enable PCI device and request regions\n",
+ ("%d: Failed to enable PCI device and request regions\n",
dev_minor);
return -EIO;
}
@@ -377,14 +377,14 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
lcr_io_base = pci_resource_start(pci_dev, 1);
lcr_io_range = pci_resource_len(pci_dev, 1);
- printk("comedi%d: local config registers at address 0x%4lx [0x%4lx]\n",
+ printk("%d: local config registers at address 0x%4lx [0x%4lx]\n",
dev_minor, lcr_io_base, lcr_io_range);
/* Read PCI6208 register base address [PCI_BASE_ADDRESS #2]. */
io_base = pci_resource_start(pci_dev, 2);
io_range = pci_resource_end(pci_dev, 2) - io_base + 1;
- printk("comedi%d: 6208 registers at address 0x%4lx [0x%4lx]\n",
+ printk("%d: 6208 registers at address 0x%4lx [0x%4lx]\n",
dev_minor, io_base, io_range);
*io_base_ptr = io_base;
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index 4de6fad..896c385 100644
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -83,7 +83,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
int ret;
printk("comedi: attempt to attach...\n");
- printk("comedi%d: adl_pci7432\n", dev->minor);
+ printk("%d: adl_pci7432\n", dev->minor);
dev->board_name = "pci7432";
bus = it->options[0];
@@ -111,7 +111,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) {
printk
- ("comedi%d: Failed to enable PCI device and request regions\n",
+ ("%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}
@@ -151,14 +151,14 @@ static int adl_pci7296_attach(struct comedi_device *dev,
}
}
- printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return -EIO;
}
static int adl_pci7296_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci7432: remove\n", dev->minor);
+ printk("%d: pci7432: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase) {
diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index e0844c6..2dd02fa 100644
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -91,7 +91,7 @@ static int adl_pci7432_attach(struct comedi_device *dev,
int bus, slot;
printk("comedi: attempt to attach...\n");
- printk("comedi%d: adl_pci7432\n", dev->minor);
+ printk("%d: adl_pci7432\n", dev->minor);
dev->board_name = "pci7432";
bus = it->options[0];
@@ -119,7 +119,7 @@ static int adl_pci7432_attach(struct comedi_device *dev,
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci7432") < 0) {
printk
- ("comedi%d: Failed to enable PCI device and request regions\n",
+ ("%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}
@@ -154,14 +154,14 @@ static int adl_pci7432_attach(struct comedi_device *dev,
}
}
- printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return -EIO;
}
static int adl_pci7432_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci7432: remove\n", dev->minor);
+ printk("%d: pci7432: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase) {
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 43745ec..d9b1d10 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -129,7 +129,7 @@ static int adl_pci8164_attach(struct comedi_device *dev,
int bus, slot;
printk("comedi: attempt to attach...\n");
- printk("comedi%d: adl_pci8164\n", dev->minor);
+ printk("%d: adl_pci8164\n", dev->minor);
dev->board_name = "pci8164";
bus = it->options[0];
@@ -157,7 +157,7 @@ static int adl_pci8164_attach(struct comedi_device *dev,
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci8164") < 0) {
printk
- ("comedi%d: Failed to enable PCI device and request regions\n",
+ ("%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}
@@ -210,14 +210,14 @@ static int adl_pci8164_attach(struct comedi_device *dev,
}
}
- printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return -EIO;
}
static int adl_pci8164_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci8164: remove\n", dev->minor);
+ printk("%d: pci8164: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase) {
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index da172a5..bf914a2 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -1227,7 +1227,7 @@ static int pci9111_attach(struct comedi_device *dev,
}
/* Probe the device to determine what device in the series it is. */
- printk("comedi%d: " PCI9111_DRIVER_NAME " driver\n", dev->minor);
+ printk("%d: " PCI9111_DRIVER_NAME " driver\n", dev->minor);
for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
pci_device != NULL;
@@ -1260,13 +1260,13 @@ static int pci9111_attach(struct comedi_device *dev,
}
}
- printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
return -EIO;
found:
- printk("comedi%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
+ printk("%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
dev->minor,
pci9111_boards[i].name,
pci_device->bus->number,
@@ -1284,13 +1284,13 @@ found:
lcr_io_range = pci_resource_len(pci_device, 1);
printk
- ("comedi%d: local configuration registers at address 0x%4lx [0x%4lx]\n",
+ ("%d: local configuration registers at address 0x%4lx [0x%4lx]\n",
dev->minor, lcr_io_base, lcr_io_range);
/* Enable PCI device and request regions */
if (comedi_pci_enable(pci_device, PCI9111_DRIVER_NAME) < 0) {
printk
- ("comedi%d: Failed to enable PCI device and request regions\n",
+ ("%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}
@@ -1299,7 +1299,7 @@ found:
io_base = pci_resource_start(pci_device, 2);
io_range = pci_resource_len(pci_device, 2);
- printk("comedi%d: 6503 registers at address 0x%4lx [0x%4lx]\n",
+ printk("%d: 6503 registers at address 0x%4lx [0x%4lx]\n",
dev->minor, io_base, io_range);
dev->iobase = io_base;
@@ -1317,7 +1317,7 @@ found:
if (pci_device->irq > 0) {
if (request_irq(pci_device->irq, pci9111_interrupt,
IRQF_SHARED, PCI9111_DRIVER_NAME, dev) != 0) {
- printk("comedi%d: unable to allocate irq %u\n",
+ printk("%d: unable to allocate irq %u\n",
dev->minor, pci_device->irq);
return -EINVAL;
}
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 1ee4b6a..549f6ad 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1057,7 +1057,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
/* uff, too short DMA buffer, disable EOS support! */
devpriv->ai_flags &= (~TRIG_WAKE_EOS);
printk
- ("comedi%d: WAR: DMA0 buf too short, cann't support TRIG_WAKE_EOS (%d<%d)\n",
+ ("%d: WAR: DMA0 buf too short, cann't support TRIG_WAKE_EOS (%d<%d)\n",
dev->minor, dmalen0,
devpriv->ai_n_realscanlen << 1);
} else {
@@ -1071,7 +1071,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
dmalen0 += 2;
if (dmalen0 < 4) {
printk
- ("comedi%d: ERR: DMA0 buf len bug? (%d<4)\n",
+ ("%d: ERR: DMA0 buf len bug? (%d<4)\n",
dev->minor, dmalen0);
dmalen0 = 4;
}
@@ -1082,7 +1082,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
/* uff, too short DMA buffer, disable EOS support! */
devpriv->ai_flags &= (~TRIG_WAKE_EOS);
printk
- ("comedi%d: WAR: DMA1 buf too short, cann't support TRIG_WAKE_EOS (%d<%d)\n",
+ ("%d: WAR: DMA1 buf too short, cann't support TRIG_WAKE_EOS (%d<%d)\n",
dev->minor, dmalen1,
devpriv->ai_n_realscanlen << 1);
} else {
@@ -1096,7 +1096,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
dmalen1 -= 2;
if (dmalen1 < 4) {
printk
- ("comedi%d: ERR: DMA1 buf len bug? (%d<4)\n",
+ ("%d: ERR: DMA1 buf len bug? (%d<4)\n",
dev->minor, dmalen1);
dmalen1 = 4;
}
@@ -1536,7 +1536,7 @@ static int check_channel_list(struct comedi_device *dev,
}
if ((frontadd + n_chan + backadd) > s->len_chanlist) {
printk
- ("comedi%d: range/channel list is too long for actual configuration (%d>%d)!",
+ ("%d: range/channel list is too long for actual configuration (%d>%d)!",
dev->minor, n_chan, s->len_chanlist - frontadd - backadd);
return 0;
}
@@ -1893,7 +1893,7 @@ static int pci9118_attach(struct comedi_device *dev,
unsigned char pci_bus, pci_slot, pci_func;
u16 u16w;
- printk("comedi%d: adl_pci9118: board=%s", dev->minor, this_board->name);
+ printk("%d: adl_pci9118: board=%s", dev->minor, this_board->name);
opt_bus = it->options[0];
opt_slot = it->options[1];
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index c5ed8bb..0011908 100644
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -200,19 +200,19 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unipolar = it->options[1];
differential = it->options[2];
- printk("comedi%d: adq12b called with options base=0x%03lx, %s and %s\n",
+ printk("%d: adq12b called with options base=0x%03lx, %s and %s\n",
dev->minor, iobase, (unipolar == 1) ? "unipolar" : "bipolar",
(differential == 1) ? "differential" : "single-ended");
/* if no address was specified, try the default 0x300 */
if (iobase == 0) {
printk
- ("comedi%d: adq12b warning: I/O base address not specified. Trying the default 0x300.\n",
+ ("%d: adq12b warning: I/O base address not specified. Trying the default 0x300.\n",
dev->minor);
iobase = 0x300;
}
- printk("comedi%d: adq12b: 0x%04lx ", dev->minor, iobase);
+ printk("%d: adq12b: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, ADQ12B_SIZE, "adq12b")) {
printk("I/O port conflict\n");
return -EIO;
@@ -309,7 +309,7 @@ static int adq12b_detach(struct comedi_device *dev)
kfree(devpriv);
- printk("comedi%d: adq12b: removed\n", dev->minor);
+ printk("%d: adq12b: removed\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index f0ae4c0..e14423b 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -609,7 +609,7 @@ static void interrupt_pci1710_every_sample(void *d)
DPRINTK("adv_pci1710 EDBG: BGN: interrupt_pci1710_every_sample(...)\n");
m = inw(dev->iobase + PCI171x_STATUS);
if (m & Status_FE) {
- printk("comedi%d: A/D FIFO empty (%4x)\n", dev->minor, m);
+ printk("%d: A/D FIFO empty (%4x)\n", dev->minor, m);
pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
comedi_event(dev, s);
@@ -617,7 +617,7 @@ static void interrupt_pci1710_every_sample(void *d)
}
if (m & Status_FF) {
printk
- ("comedi%d: A/D FIFO Full status (Fatal Error!) (%4x)\n",
+ ("%d: A/D FIFO Full status (Fatal Error!) (%4x)\n",
dev->minor, m);
pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
@@ -702,7 +702,7 @@ static int move_block_from_fifo(struct comedi_device *dev,
if (this_board->cardtype != TYPE_PCI1713)
if ((sampl & 0xf000) != devpriv->act_chanlist[j]) {
printk
- ("comedi%d: A/D FIFO data dropout: received data from channel %d, expected %d! (%d/%d/%d/%d/%d/%4x)\n",
+ ("%d: A/D FIFO data dropout: received data from channel %d, expected %d! (%d/%d/%d/%d/%d/%4x)\n",
dev->minor, (sampl & 0xf000) >> 12,
(devpriv->act_chanlist[j] & 0xf000) >> 12,
i, j, devpriv->ai_act_scan, n, turn,
@@ -740,7 +740,7 @@ static void interrupt_pci1710_half_fifo(void *d)
DPRINTK("adv_pci1710 EDBG: BGN: interrupt_pci1710_half_fifo(...)\n");
m = inw(dev->iobase + PCI171x_STATUS);
if (!(m & Status_FH)) {
- printk("comedi%d: A/D FIFO not half full! (%4x)\n",
+ printk("%d: A/D FIFO not half full! (%4x)\n",
dev->minor, m);
pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
@@ -749,7 +749,7 @@ static void interrupt_pci1710_half_fifo(void *d)
}
if (m & Status_FF) {
printk
- ("comedi%d: A/D FIFO Full status (Fatal Error!) (%4x)\n",
+ ("%d: A/D FIFO Full status (Fatal Error!) (%4x)\n",
dev->minor, m);
pci171x_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
@@ -1373,7 +1373,7 @@ static int pci1710_attach(struct comedi_device *dev,
int i;
int board_index;
- printk("comedi%d: adv_pci1710: ", dev->minor);
+ printk("%d: adv_pci1710: ", dev->minor);
opt_bus = it->options[0];
opt_slot = it->options[1];
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 6b0b7ed..ffdccb0 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -311,7 +311,7 @@ static int pci1723_attach(struct comedi_device *dev,
int opt_bus, opt_slot;
const char *errstr;
- printk("comedi%d: adv_pci1723: board=%s", dev->minor, this_board->name);
+ printk("%d: adv_pci1723: board=%s", dev->minor, this_board->name);
opt_bus = it->options[0];
opt_slot = it->options[1];
@@ -450,7 +450,7 @@ static int pci1723_attach(struct comedi_device *dev,
*/
static int pci1723_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci1723: remove\n", dev->minor);
+ printk("%d: pci1723: remove\n", dev->minor);
if (dev->private) {
if (devpriv->valid)
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 61d35fe..1292227 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -910,7 +910,7 @@ static int pci_dio_attach(struct comedi_device *dev,
unsigned long iobase;
struct pci_dev *pcidev;
- printk("comedi%d: adv_pci_dio: ", dev->minor);
+ printk("%d: adv_pci_dio: ", dev->minor);
ret = alloc_private(dev, sizeof(struct pci_dio_private));
if (ret < 0) {
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c
index 3857fd5..6f72930 100644
--- a/drivers/staging/comedi/drivers/aio_iiro_16.c
+++ b/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -98,7 +98,7 @@ static int aio_iiro_16_attach(struct comedi_device *dev,
int iobase;
struct comedi_subdevice *s;
- printk("comedi%d: aio_iiro_16: ", dev->minor);
+ printk("%d: aio_iiro_16: ", dev->minor);
dev->board_name = thisboard->name;
@@ -140,7 +140,7 @@ static int aio_iiro_16_attach(struct comedi_device *dev,
static int aio_iiro_16_detach(struct comedi_device *dev)
{
- printk("comedi%d: aio_iiro_16: remove\n", dev->minor);
+ printk("%d: aio_iiro_16: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, AIO_IIRO_16_SIZE);
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 69ab281..b94c9a9 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -546,11 +546,10 @@ dio200_find_pci(struct comedi_device *dev, int bus, int slot,
}
/* No match found. */
if (bus || slot) {
- printk(KERN_ERR
- "comedi%d: error! no %s found at pci %02x:%02x!\n",
+ pr_err("%d: error! no %s found at pci %02x:%02x!\n",
dev->minor, thisboard->name, bus, slot);
} else {
- printk(KERN_ERR "comedi%d: error! no %s found!\n",
+ pr_err("%d: error! no %s found!\n",
dev->minor, thisboard->name);
}
return -EIO;
@@ -565,7 +564,7 @@ static int
dio200_request_region(unsigned minor, unsigned long from, unsigned long extent)
{
if (!from || !request_region(from, extent, DIO200_DRIVER_NAME)) {
- printk(KERN_ERR "comedi%d: I/O port conflict (%#lx,%lu)!\n",
+ pr_err("%d: I/O port conflict (%#lx,%lu)!\n",
minor, from, extent);
return -EIO;
}
@@ -971,7 +970,7 @@ dio200_subdev_intr_init(struct comedi_device *dev, struct comedi_subdevice *s,
subpriv = kzalloc(sizeof(*subpriv), GFP_KERNEL);
if (!subpriv) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
+ pr_err("%d: error! out of memory!\n",
dev->minor);
return -ENOMEM;
}
@@ -1217,7 +1216,7 @@ dio200_subdev_8254_init(struct comedi_device *dev, struct comedi_subdevice *s,
subpriv = kzalloc(sizeof(*subpriv), GFP_KERNEL);
if (!subpriv) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
+ pr_err("%d: error! out of memory!\n",
dev->minor);
return -ENOMEM;
}
@@ -1293,12 +1292,12 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned n;
int ret;
- printk(KERN_DEBUG "comedi%d: %s: attach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: attach\n", dev->minor,
DIO200_DRIVER_NAME);
ret = alloc_private(dev, sizeof(struct dio200_private));
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
+ pr_err("%d: error! out of memory!\n",
dev->minor);
return ret;
}
@@ -1323,8 +1322,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
break;
#endif
default:
- printk(KERN_ERR
- "comedi%d: %s: BUG! cannot determine board type!\n",
+ pr_err("%d: %s: BUG! cannot determine board type!\n",
dev->minor, DIO200_DRIVER_NAME);
return -EINVAL;
break;
@@ -1337,8 +1335,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (pci_dev) {
ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
if (ret < 0) {
- printk(KERN_ERR
- "comedi%d: error! cannot enable PCI device and request regions!\n",
+ pr_err("%d: error! cannot enable PCI device and request regions!\n",
dev->minor);
return ret;
}
@@ -1358,7 +1355,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ret = alloc_subdevices(dev, layout->n_subdevs);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
+ pr_err("%d: error! out of memory!\n",
dev->minor);
return ret;
}
@@ -1420,13 +1417,12 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
DIO200_DRIVER_NAME, dev) >= 0) {
dev->irq = irq;
} else {
- printk(KERN_WARNING
- "comedi%d: warning! irq %u unavailable!\n",
+ pr_warning("%d: warning! irq %u unavailable!\n",
dev->minor, irq);
}
}
- printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
+ pr_info("%d: %s ", dev->minor, dev->board_name);
if (thisboard->bustype == isa_bustype) {
printk("(base %#lx) ", iobase);
} else {
@@ -1458,7 +1454,7 @@ static int dio200_detach(struct comedi_device *dev)
const struct dio200_layout_struct *layout;
unsigned n;
- printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: detach\n", dev->minor,
DIO200_DRIVER_NAME);
if (dev->irq) {
@@ -1499,7 +1495,7 @@ static int dio200_detach(struct comedi_device *dev)
}
}
if (dev->board_name) {
- printk(KERN_INFO "comedi%d: %s removed\n",
+ pr_info("%d: %s removed\n",
dev->minor, dev->board_name);
}
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 1032a81..84beab9 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -254,12 +254,10 @@ pc236_find_pci(struct comedi_device *dev, int bus, int slot,
}
/* No match found. */
if (bus || slot) {
- printk(KERN_ERR
- "comedi%d: error! no %s found at pci %02x:%02x!\n",
+ pr_err("%d: error! no %s found at pci %02x:%02x!\n",
dev->minor, thisboard->name, bus, slot);
} else {
- printk(KERN_ERR "comedi%d: error! no %s found!\n",
- dev->minor, thisboard->name);
+ pr_err("%d: error! no %s found!\n", dev->minor, thisboard->name);
}
return -EIO;
}
@@ -283,7 +281,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int share_irq = 0;
int ret;
- printk(KERN_DEBUG "comedi%d: %s: attach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: attach\n", dev->minor,
PC236_DRIVER_NAME);
/*
* Allocate the private structure area. alloc_private() is a
@@ -291,8 +289,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
ret = alloc_private(dev, sizeof(struct pc236_private));
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
/* Process options. */
@@ -315,8 +312,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
break;
#endif /* CONFIG_COMEDI_PCI */
default:
- printk(KERN_ERR
- "comedi%d: %s: BUG! cannot determine board type!\n",
+ pr_err("%d: %s: BUG! cannot determine board type!\n",
dev->minor, PC236_DRIVER_NAME);
return -EINVAL;
break;
@@ -333,8 +329,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ret = comedi_pci_enable(pci_dev, PC236_DRIVER_NAME);
if (ret < 0) {
- printk(KERN_ERR
- "comedi%d: error! cannot enable PCI device and request regions!\n",
+ pr_err("%d: error! cannot enable PCI device and request regions!\n",
dev->minor);
return ret;
}
@@ -357,8 +352,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
ret = alloc_subdevices(dev, 2);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
@@ -366,8 +360,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* digital i/o subdevice (8255) */
ret = subdev_8255_init(dev, s, NULL, iobase);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
s = dev->subdevices + 1;
@@ -391,21 +384,21 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->cancel = pc236_intr_cancel;
}
}
- printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
+ pr_info("%d: %s ", dev->minor, dev->board_name);
if (thisboard->bustype == isa_bustype) {
- printk("(base %#lx) ", iobase);
+ pr_cont("(base %#lx) ", iobase);
} else {
#ifdef CONFIG_COMEDI_PCI
- printk("(pci %s) ", pci_name(pci_dev));
+ pr_cont("(pci %s) ", pci_name(pci_dev));
#endif
}
if (irq) {
- printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
+ pr_cont("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
} else {
- printk("(no irq) ");
+ pr_cont("(no irq) ");
}
- printk("attached\n");
+ pr_cont("attached\n");
return 1;
}
@@ -420,7 +413,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int pc236_detach(struct comedi_device *dev)
{
- printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: detach\n", dev->minor,
PC236_DRIVER_NAME);
if (devpriv) {
pc236_intr_disable(dev);
@@ -446,8 +439,7 @@ static int pc236_detach(struct comedi_device *dev)
}
}
if (dev->board_name) {
- printk(KERN_INFO "comedi%d: %s removed\n",
- dev->minor, dev->board_name);
+ pr_info("%d: %s removed\n", dev->minor, dev->board_name);
}
return 0;
}
@@ -460,7 +452,7 @@ static int pc236_request_region(unsigned minor, unsigned long from,
unsigned long extent)
{
if (!from || !request_region(from, extent, PC236_DRIVER_NAME)) {
- printk(KERN_ERR "comedi%d: I/O port conflict (%#lx,%lu)!\n",
+ pr_err("%d: I/O port conflict (%#lx,%lu)!\n",
minor, from, extent);
return -EIO;
}
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index c62a7e1..d798ae6 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -205,11 +205,10 @@ pc263_find_pci(struct comedi_device *dev, int bus, int slot,
}
/* No match found. */
if (bus || slot) {
- printk(KERN_ERR
- "comedi%d: error! no %s found at pci %02x:%02x!\n",
+ pr_err("%d: error! no %s found at pci %02x:%02x!\n",
dev->minor, thisboard->name, bus, slot);
} else {
- printk(KERN_ERR "comedi%d: error! no %s found!\n",
+ pr_err("%d: error! no %s found!\n",
dev->minor, thisboard->name);
}
return -EIO;
@@ -232,7 +231,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
#endif
int ret;
- printk(KERN_DEBUG "comedi%d: %s: attach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: attach\n", dev->minor,
PC263_DRIVER_NAME);
/*
* Allocate the private structure area. alloc_private() is a
@@ -241,7 +240,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
#ifdef CONFIG_COMEDI_PCI
ret = alloc_private(dev, sizeof(struct pc263_private));
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
+ pr_err("%d: error! out of memory!\n",
dev->minor);
return ret;
}
@@ -263,8 +262,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
break;
#endif /* CONFIG_COMEDI_PCI */
default:
- printk(KERN_ERR
- "comedi%d: %s: BUG! cannot determine board type!\n",
+ pr_err("%d: %s: BUG! cannot determine board type!\n",
dev->minor, PC263_DRIVER_NAME);
return -EINVAL;
break;
@@ -280,8 +278,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (pci_dev) {
ret = comedi_pci_enable(pci_dev, PC263_DRIVER_NAME);
if (ret < 0) {
- printk(KERN_ERR
- "comedi%d: error! cannot enable PCI device and request regions!\n",
+ pr_err("%d: error! cannot enable PCI device and request regions!\n",
dev->minor);
return ret;
}
@@ -302,8 +299,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
ret = alloc_subdevices(dev, 1);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
@@ -322,16 +318,16 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->state = inb(dev->iobase);
s->state = s->state | (inb(dev->iobase) << 8);
- printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
+ pr_info("%d: %s ", dev->minor, dev->board_name);
if (thisboard->bustype == isa_bustype) {
- printk("(base %#lx) ", iobase);
+ pr_cont("(base %#lx) ", iobase);
} else {
#ifdef CONFIG_COMEDI_PCI
- printk("(pci %s) ", pci_name(pci_dev));
+ pr_cont("(pci %s) ", pci_name(pci_dev));
#endif
}
- printk("attached\n");
+ pr_cont("attached\n");
return 1;
}
@@ -346,7 +342,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int pc263_detach(struct comedi_device *dev)
{
- printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
+ printk(KERN_DEBUG "%d: %s: detach\n", dev->minor,
PC263_DRIVER_NAME);
#ifdef CONFIG_COMEDI_PCI
@@ -368,8 +364,7 @@ static int pc263_detach(struct comedi_device *dev)
}
}
if (dev->board_name) {
- printk(KERN_INFO "comedi%d: %s removed\n",
- dev->minor, dev->board_name);
+ pr_info("%d: %s removed\n", dev->minor, dev->board_name);
}
return 0;
}
@@ -382,7 +377,7 @@ static int pc263_request_region(unsigned minor, unsigned long from,
unsigned long extent)
{
if (!from || !request_region(from, extent, PC263_DRIVER_NAME)) {
- printk(KERN_ERR "comedi%d: I/O port conflict (%#lx,%lu)!\n",
+ pr_err("%d: I/O port conflict (%#lx,%lu)!\n",
minor, from, extent);
return -EIO;
}
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index d983687..82471b7 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -663,8 +663,7 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev,
/* Nothing left to put in the FIFO. */
pci224_ao_stop(dev, s);
s->async->events |= COMEDI_CB_OVERFLOW;
- printk(KERN_ERR "comedi%d: "
- "AO buffer underrun\n", dev->minor);
+ pr_err("%d: AO buffer underrun\n", dev->minor);
}
}
/* Determine how many new scans can be put in the FIFO. */
@@ -1003,13 +1002,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
}
if (errors) {
if (errors & dupchan_err) {
- DPRINTK("comedi%d: " DRIVER_NAME
+ DPRINTK("%d: " DRIVER_NAME
": ao_cmdtest: "
"entries in chanlist must contain no "
"duplicate channels\n", dev->minor);
}
if (errors & range_err) {
- DPRINTK("comedi%d: " DRIVER_NAME
+ DPRINTK("%d: " DRIVER_NAME
": ao_cmdtest: "
"entries in chanlist must all have "
"the same range index\n", dev->minor);
@@ -1323,11 +1322,10 @@ pci224_find_pci(struct comedi_device *dev, int bus, int slot,
}
/* No match found. */
if (bus || slot) {
- printk(KERN_ERR "comedi%d: error! "
- "no %s found at pci %02x:%02x!\n",
+ pr_err("%d: error! no %s found at pci %02x:%02x!\n",
dev->minor, thisboard->name, bus, slot);
} else {
- printk(KERN_ERR "comedi%d: error! no %s found!\n",
+ pr_err("%d: error! no %s found!\n",
dev->minor, thisboard->name);
}
return -EIO;
@@ -1348,14 +1346,13 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned n;
int ret;
- printk(KERN_DEBUG "comedi%d: %s: attach\n", dev->minor, DRIVER_NAME);
+ printk(KERN_DEBUG "%d: %s: attach\n", dev->minor, DRIVER_NAME);
bus = it->options[0];
slot = it->options[1];
ret = alloc_private(dev, sizeof(struct pci224_private));
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
@@ -1366,9 +1363,8 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->pci_dev = pci_dev;
ret = comedi_pci_enable(pci_dev, DRIVER_NAME);
if (ret < 0) {
- printk(KERN_ERR
- "comedi%d: error! cannot enable PCI device "
- "and request regions!\n", dev->minor);
+ pr_err("%d: error! cannot enable PCI device and request regions!\n",
+ dev->minor);
return ret;
}
spin_lock_init(&devpriv->ao_spinlock);
@@ -1415,8 +1411,7 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Allocate subdevices. There is only one! */
ret = alloc_subdevices(dev, 1);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! out of memory!\n",
- dev->minor);
+ pr_err("%d: error! out of memory!\n", dev->minor);
return ret;
}
@@ -1449,10 +1444,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
for (n = 2; n < 3 + s->n_chan; n++) {
if (it->options[n] < 0 || it->options[n] > 1) {
- printk(KERN_WARNING "comedi%d: %s: warning! "
- "bad options[%u]=%d\n",
- dev->minor, DRIVER_NAME, n,
- it->options[n]);
+ pr_warning("%d: %s: warning! bad options[%u]=%d\n",
+ dev->minor, DRIVER_NAME, n,
+ it->options[n]);
}
}
for (n = 0; n < s->n_chan; n++) {
@@ -1480,9 +1474,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->hwrange = hwrange_pci224_external;
} else {
if (it->options[2] != 0) {
- printk(KERN_WARNING "comedi%d: %s: warning! "
- "bad options[2]=%d\n",
- dev->minor, DRIVER_NAME, it->options[2]);
+ pr_warning("%d: %s: warning! bad options[2]=%d\n",
+ dev->minor, DRIVER_NAME,
+ it->options[2]);
}
s->range_table = &range_pci224_internal;
devpriv->hwrange = hwrange_pci224_internal;
@@ -1495,20 +1489,20 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ret = request_irq(irq, pci224_interrupt, IRQF_SHARED,
DRIVER_NAME, dev);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: error! "
- "unable to allocate irq %u\n", dev->minor, irq);
+ pr_err("%d: error! unable to allocate irq %u\n",
+ dev->minor, irq);
return ret;
} else {
dev->irq = irq;
}
}
- printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
- printk("(pci %s) ", pci_name(pci_dev));
+ pr_info("%d: %s ", dev->minor, dev->board_name);
+ pr_cont("(pci %s) ", pci_name(pci_dev));
if (irq) {
- printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
+ pr_cont("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
} else {
- printk("(no irq) ");
+ pr_cont("(no irq) ");
}
printk("attached\n");
@@ -1526,7 +1520,7 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int pci224_detach(struct comedi_device *dev)
{
- printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, DRIVER_NAME);
+ printk(KERN_DEBUG "%d: %s: detach\n", dev->minor, DRIVER_NAME);
if (dev->irq) {
free_irq(dev->irq, dev);
@@ -1558,7 +1552,7 @@ static int pci224_detach(struct comedi_device *dev)
}
}
if (dev->board_name) {
- printk(KERN_INFO "comedi%d: %s removed\n",
+ pr_info("%d: %s removed\n",
dev->minor, dev->board_name);
}
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 091a1a5..b4333e2 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -729,7 +729,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct pci_dev *pci_dev;
int i = 0, irq_hdl, rc;
- printk("comedi%d: amplc_pci230: attach %s %d,%d\n", dev->minor,
+ printk("%d: amplc_pci230: attach %s %d,%d\n", dev->minor,
thisboard->name, it->options[0], it->options[1]);
/* Allocate the private structure area using alloc_private().
@@ -806,7 +806,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
if (!pci_dev) {
- printk("comedi%d: No %s card found\n", dev->minor,
+ printk("%d: No %s card found\n", dev->minor,
thisboard->name);
return -EIO;
}
@@ -819,7 +819,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Enable PCI device and reserve I/O spaces. */
if (comedi_pci_enable(pci_dev, "amplc_pci230") < 0) {
- printk("comedi%d: failed to enable PCI device "
+ printk("%d: failed to enable PCI device "
"and request regions\n", dev->minor);
return -EIO;
}
@@ -829,7 +829,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase1 = pci_resource_start(pci_dev, 2);
iobase2 = pci_resource_start(pci_dev, 3);
- printk("comedi%d: %s I/O region 1 0x%04lx I/O region 2 0x%04lx\n",
+ printk("%d: %s I/O region 1 0x%04lx I/O region 2 0x%04lx\n",
dev->minor, dev->board_name, iobase1, iobase2);
devpriv->iobase1 = iobase1;
@@ -845,7 +845,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->hwver = inw(dev->iobase + PCI230P_HWVER);
if (devpriv->hwver < thisboard->min_hwver) {
- printk("comedi%d: %s - bad hardware version "
+ printk("%d: %s - bad hardware version "
"- got %u, need %u\n", dev->minor,
dev->board_name, devpriv->hwver,
thisboard->min_hwver);
@@ -896,12 +896,12 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq_hdl = request_irq(devpriv->pci_dev->irq, pci230_interrupt,
IRQF_SHARED, "amplc_pci230", dev);
if (irq_hdl < 0) {
- printk("comedi%d: unable to register irq, "
+ printk("%d: unable to register irq, "
"commands will not be available %d\n", dev->minor,
devpriv->pci_dev->irq);
} else {
dev->irq = devpriv->pci_dev->irq;
- printk("comedi%d: registered irq %u\n", dev->minor,
+ printk("%d: registered irq %u\n", dev->minor,
devpriv->pci_dev->irq);
}
@@ -965,7 +965,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_UNUSED;
}
- printk("comedi%d: attached\n", dev->minor);
+ printk("%d: attached\n", dev->minor);
return 1;
}
@@ -980,7 +980,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int pci230_detach(struct comedi_device *dev)
{
- printk("comedi%d: amplc_pci230: remove\n", dev->minor);
+ printk("%d: amplc_pci230: remove\n", dev->minor);
if (dev->subdevices && thisboard->have_dio)
/* Clean up dio subdevice. */
@@ -1095,7 +1095,7 @@ static int pci230_ai_rinsn(struct comedi_device *dev,
if (aref == AREF_DIFF) {
/* Differential. */
if (chan >= s->n_chan / 2) {
- DPRINTK("comedi%d: amplc_pci230: ai_rinsn: "
+ DPRINTK("%d: amplc_pci230: ai_rinsn: "
"differential channel number out of range "
"0 to %u\n", dev->minor, (s->n_chan / 2) - 1);
return -EINVAL;
@@ -1420,12 +1420,12 @@ static int pci230_ao_cmdtest(struct comedi_device *dev,
if (errors != 0) {
err++;
if ((errors & seq_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ao_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ao_cmdtest: "
"channel numbers must increase\n",
dev->minor);
}
if ((errors & range_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ao_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ao_cmdtest: "
"channels must have the same range\n",
dev->minor);
}
@@ -2013,30 +2013,30 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,
if (errors != 0) {
err++;
if ((errors & seq_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ai_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ai_cmdtest: "
"channel numbers must increase or "
"sequence must repeat exactly\n",
dev->minor);
}
if ((errors & rangepair_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ai_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ai_cmdtest: "
"single-ended channel pairs must "
"have the same range\n", dev->minor);
}
if ((errors & polarity_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ai_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ai_cmdtest: "
"channel sequence ranges must be all "
"bipolar or all unipolar\n",
dev->minor);
}
if ((errors & aref_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ai_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ai_cmdtest: "
"channel sequence analogue references "
"must be all the same (single-ended "
"or differential)\n", dev->minor);
}
if ((errors & diffchan_err) != 0) {
- DPRINTK("comedi%d: amplc_pci230: ai_cmdtest: "
+ DPRINTK("%d: amplc_pci230: ai_cmdtest: "
"differential channel number out of "
"range 0 to %u\n", dev->minor,
(s->n_chan / 2) - 1);
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index abb0532..88a2324 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -440,9 +440,9 @@ static int c6xdigio_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
iobase = it->options[0];
- printk("comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
+ printk("%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, C6XDIGIO_SIZE, "c6xdigio")) {
- printk("comedi%d: I/O port conflict\n", dev->minor);
+ printk("%d: I/O port conflict\n", dev->minor);
return -EIO;
}
dev->iobase = iobase;
@@ -457,9 +457,9 @@ static int c6xdigio_attach(struct comedi_device *dev,
irq = it->options[1];
if (irq > 0) {
- printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
+ printk("%d: irq = %u ignored\n", dev->minor, irq);
} else if (irq == 0) {
- printk("comedi%d: no irq\n", dev->minor);
+ printk("%d: no irq\n", dev->minor);
}
s = dev->subdevices + 0;
@@ -505,7 +505,7 @@ static int c6xdigio_detach(struct comedi_device *dev)
{
/* board_halt(dev); may not need this */
- printk("comedi%d: c6xdigio: remove\n", dev->minor);
+ printk("%d: c6xdigio: remove\n", dev->minor);
if (dev->iobase) {
release_region(dev->iobase, C6XDIGIO_SIZE);
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 80c0df8..2268a3e 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -187,7 +187,7 @@ static int das16cs_attach(struct comedi_device *dev,
int ret;
int i;
- printk("comedi%d: cb_das16_cs: ", dev->minor);
+ printk("%d: cb_das16_cs: ", dev->minor);
link = cur_dev; /* XXX hack */
if (!link)
@@ -282,7 +282,7 @@ static int das16cs_attach(struct comedi_device *dev,
static int das16cs_detach(struct comedi_device *dev)
{
- printk("comedi%d: das16cs: remove\n", dev->minor);
+ printk("%d: das16cs: remove\n", dev->minor);
if (dev->irq) {
free_irq(dev->irq, dev);
@@ -916,7 +916,7 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
+ pr_info("%s: index 0x%02x",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %u", link->irq.AssignedIRQ);
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index f3e66c4..75059e2 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -537,7 +537,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
int index;
int i;
- printk("comedi%d: cb_pcidas: ", dev->minor);
+ printk("%d: cb_pcidas: ", dev->minor);
/*
* Allocate the private structure area.
@@ -742,7 +742,7 @@ found:
*/
static int cb_pcidas_detach(struct comedi_device *dev)
{
- printk("comedi%d: cb_pcidas: remove\n", dev->minor);
+ printk("%d: cb_pcidas: remove\n", dev->minor);
if (devpriv) {
if (devpriv->s5933_config) {
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 82295e0..ab758d6 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1722,7 +1722,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
uint32_t local_range, local_decode;
int retval;
- printk("comedi%d: cb_pcidas64\n", dev->minor);
+ printk("%d: cb_pcidas64\n", dev->minor);
/*
* Allocate the private structure area.
@@ -1770,8 +1770,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
pcidev->bus->number, PCI_SLOT(pcidev->devfn));
if (comedi_pci_enable(pcidev, driver_cb_pcidas.driver_name)) {
- printk(KERN_WARNING
- " failed to enable PCI device and request regions\n");
+ pr_warning(" failed to enable PCI device and request regions\n");
return -EIO;
}
pci_set_master(pcidev);
@@ -1867,7 +1866,7 @@ static int detach(struct comedi_device *dev)
{
unsigned int i;
- printk("comedi%d: cb_pcidas: remove\n", dev->minor);
+ printk("%d: cb_pcidas: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 7a5d46e..e353057 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -284,7 +284,7 @@ static int cb_pcidda_attach(struct comedi_device *dev,
struct pci_dev *pcidev;
int index;
- printk("comedi%d: cb_pcidda: ", dev->minor);
+ printk("%d: cb_pcidda: ", dev->minor);
/*
* Allocate the private structure area.
@@ -422,7 +422,7 @@ static int cb_pcidda_detach(struct comedi_device *dev)
subdev_8255_cleanup(dev, dev->subdevices + 2);
}
- printk("comedi%d: cb_pcidda: remove\n", dev->minor);
+ printk("%d: cb_pcidda: remove\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index 09e6e3b..7091c59 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -185,7 +185,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int index;
int i;
- printk("comedi%d: cb_pcidio: \n", dev->minor);
+ printk("%d: cb_pcidio: \n", dev->minor);
/*
* Allocate the private structure area. alloc_private() is a
@@ -280,7 +280,7 @@ found:
*/
static int pcidio_detach(struct comedi_device *dev)
{
- printk("comedi%d: cb_pcidio: remove\n", dev->minor);
+ printk("%d: cb_pcidio: remove\n", dev->minor);
if (devpriv) {
if (devpriv->pci_dev) {
if (devpriv->dio_reg_base) {
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index cbbca05..fe69e06 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -212,7 +212,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
int index;
/* int i; */
- printk("comedi%d: cb_pcimdas: ", dev->minor);
+ printk("%d: cb_pcimdas: ", dev->minor);
/*
* Allocate the private structure area.
@@ -360,7 +360,7 @@ static int cb_pcimdas_detach(struct comedi_device *dev)
printk("devpriv->BADR4 = 0x%lx\n", devpriv->BADR4);
}
#endif
- printk("comedi%d: cb_pcimdas: remove\n", dev->minor);
+ printk("%d: cb_pcimdas: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv) {
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 980fa0a..814f010 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -261,7 +261,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
return err;
/* Output some info */
- printk("comedi%d: %s: ", dev->minor, thisboard->name);
+ printk("%d: %s: ", dev->minor, thisboard->name);
/*
* Initialize dev->board_name. Note that we can use the "thisboard"
@@ -344,7 +344,7 @@ static int detach(struct comedi_device *dev)
}
if (devpriv->attached_successfully && thisboard)
- printk("comedi%d: %s: detached\n", dev->minor,
+ printk("%d: %s: detached\n", dev->minor,
thisboard->name);
}
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index cf39a24..fd0c30c 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -108,14 +108,14 @@ module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "If true, print extra cryptic debugging output useful"
"only to developers.");
-#define LOG_MSG(x...) printk(KERN_INFO MODULE_NAME": "x)
+#define LOG_MSG(x...) pr_info(MODULE_NAME": "x)
#define DEBUG(x...) \
do { \
if (debug) \
printk(KERN_DEBUG MODULE_NAME": DEBUG: "x); \
} while (0)
-#define WARNING(x...) printk(KERN_WARNING MODULE_NAME ": WARNING: "x)
-#define ERROR(x...) printk(KERN_ERR MODULE_NAME ": INTERNAL ERROR: "x)
+#define WARNING(x...) pr_warning(MODULE_NAME ": WARNING: "x)
+#define ERROR(x...) pr_err(MODULE_NAME ": INTERNAL ERROR: "x)
MODULE_AUTHOR("Calin A. Culianu");
MODULE_DESCRIPTION(MODULE_NAME "A driver for COMEDI to bond multiple COMEDI "
"devices together as one. In the words of John Lennon: "
@@ -288,7 +288,7 @@ static int bonding_attach(struct comedi_device *dev,
*/
static int bonding_detach(struct comedi_device *dev)
{
- LOG_MSG("comedi%d: remove\n", dev->minor);
+ LOG_MSG("%d: remove\n", dev->minor);
doDevUnconfig(dev);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 043afe4..ce4035c 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -81,6 +81,8 @@ pin, which can be used to wake up tasks.
or http://www.linux-magazin.de/ausgabe/1999/10/IO/io.html
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "../comedidev.h"
#include <linux/interrupt.h>
#include <linux/ioport.h>
@@ -287,7 +289,7 @@ static irqreturn_t parport_interrupt(int irq, void *d)
struct comedi_subdevice *s = dev->subdevices + 3;
if (!devpriv->enable_irq) {
- printk(KERN_ERR "comedi_parport: bogus irq, ignored\n");
+ pr_err("bogus irq, ignored\n");
return IRQ_NONE;
}
@@ -307,20 +309,20 @@ static int parport_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
iobase = it->options[0];
- printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
+ pr_info("%d: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PARPORT_SIZE, "parport (comedi)")) {
- printk("I/O port conflict\n");
+ pr_cont("I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
irq = it->options[1];
if (irq) {
- printk(" irq=%u", irq);
+ pr_cont(" irq=%u", irq);
ret = request_irq(irq, parport_interrupt, 0, "comedi_parport",
dev);
if (ret < 0) {
- printk(" irq not available\n");
+ pr_cont(" irq not available\n");
return -EINVAL;
}
dev->irq = irq;
@@ -380,13 +382,13 @@ static int parport_attach(struct comedi_device *dev,
devpriv->c_data = 0;
outb(devpriv->c_data, dev->iobase + PARPORT_C);
- printk("\n");
+ pr_cont("\n");
return 1;
}
static int parport_detach(struct comedi_device *dev)
{
- printk("comedi%d: parport: remove\n", dev->minor);
+ pr_info("%d: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, PARPORT_SIZE);
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index ef83a1a..6201d2d 100644
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -268,15 +268,14 @@ static int waveform_attach(struct comedi_device *dev,
devpriv->timer.function = waveform_ai_interrupt;
devpriv->timer.data = (unsigned long)dev;
- printk(KERN_INFO "comedi%d: comedi_test: "
- "%i microvolt, %li microsecond waveform attached\n", dev->minor,
+ pr_info("%d: comedi_test: %i microvolt, %li microsecond waveform attached\n", dev->minor,
devpriv->uvolt_amplitude, devpriv->usec_period);
return 1;
}
static int waveform_detach(struct comedi_device *dev)
{
- printk("comedi%d: comedi_test: remove\n", dev->minor);
+ printk("%d: comedi_test: remove\n", dev->minor);
if (dev->private)
waveform_ai_cancel(dev, dev->read_subdev);
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index b16d652..26925ab 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -34,6 +34,8 @@ Configuration Options:
PCI device found will be used.
*/
+#define pr_fmt(fmt) "contec: " fmt
+
#include "../comedidev.h"
#include "comedi_pci.h"
@@ -106,7 +108,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct pci_dev *pcidev;
struct comedi_subdevice *s;
- printk("comedi%d: contec: ", dev->minor);
+ pr_info("%d: ", dev->minor);
dev->board_name = thisboard->name;
@@ -131,12 +133,11 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "contec_pci_dio")) {
- printk
- ("error enabling PCI device and request regions!\n");
+ pr_cont("error enabling PCI device and request regions!\n");
return -EIO;
}
dev->iobase = pci_resource_start(pcidev, 0);
- printk(" base addr %lx ", dev->iobase);
+ pr_cont(" base addr %lx ", dev->iobase);
dev->board_ptr = contec_boards + 0;
@@ -157,20 +158,20 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_digital;
s->insn_bits = contec_do_insn_bits;
- printk("attached\n");
+ pr_cont("attached\n");
return 1;
}
}
- printk("card not present!\n");
+ pr_cont("card not present!\n");
return -EIO;
}
static int contec_detach(struct comedi_device *dev)
{
- printk("comedi%d: contec: remove\n", dev->minor);
+ pr_info("%d: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase) {
@@ -186,7 +187,7 @@ static int contec_detach(struct comedi_device *dev)
static int contec_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd)
{
- printk("contec_cmdtest called\n");
+ pr_info("contec_cmdtest called\n");
return 0;
}
@@ -201,8 +202,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{
- printk("contec_do_insn_bits called\n");
- printk(" data: %d %d\n", data[0], data[1]);
+ pr_info("contec_do_insn_bits called\n");
+ pr_info(" data: %d %d\n", data[0], data[1]);
if (insn->n != 2)
return -EINVAL;
@@ -210,7 +211,7 @@ static int contec_do_insn_bits(struct comedi_device *dev,
if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
- printk(" out: %d on %lx\n", s->state,
+ pr_info(" out: %d on %lx\n", s->state,
dev->iobase + thisboard->out_offs);
outw(s->state, dev->iobase + thisboard->out_offs);
}
@@ -222,8 +223,8 @@ static int contec_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{
- printk("contec_di_insn_bits called\n");
- printk(" data: %d %d\n", data[0], data[1]);
+ pr_info("contec_di_insn_bits called\n");
+ pr_info(" data: %d %d\n", data[0], data[1]);
if (insn->n != 2)
return -EINVAL;
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 078ec27..db0cd85 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -737,7 +737,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
unsigned int aux_len;
int bus, slot;
- printk("comedi%d: daqboard2000:", dev->minor);
+ printk("%d: daqboard2000:", dev->minor);
bus = it->options[0];
slot = it->options[1];
@@ -864,7 +864,7 @@ out:
static int daqboard2000_detach(struct comedi_device *dev)
{
- printk("comedi%d: daqboard2000: remove\n", dev->minor);
+ printk("%d: daqboard2000: remove\n", dev->minor);
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2);
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index f425833..432bbef 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -51,6 +51,8 @@ comedi_rt_timer driver can be used to emulate commands for this
driver.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "../comedidev.h"
#include <linux/delay.h>
@@ -980,7 +982,7 @@ static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret < 0)
return ret;
- printk("comedi%d: das08: ", dev->minor);
+ printk("%d: das08: ", dev->minor);
/* deal with a pci board */
if (thisboard->bustype == pci) {
#ifdef CONFIG_COMEDI_PCI
@@ -1047,7 +1049,7 @@ static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int das08_common_detach(struct comedi_device *dev)
{
- printk(KERN_INFO "comedi%d: das08: remove\n", dev->minor);
+ pr_info("%d: remove\n", dev->minor);
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 4);
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 9cab21e..7321720 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -80,7 +80,7 @@ static int das08_cs_attach(struct comedi_device *dev,
if (ret < 0)
return ret;
- printk("comedi%d: das08_cs: ", dev->minor);
+ printk("%d: das08_cs: ", dev->minor);
/* deal with a pci board */
if (thisboard->bustype == pcmcia) {
@@ -391,7 +391,7 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
+ pr_info("%s: index 0x%02x",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %u", link->irq.AssignedIRQ);
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 10a87e6..e1fb448 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -1405,7 +1405,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (timer_mode)
irq = 0;
- printk("comedi%d: das16:", dev->minor);
+ printk("%d: das16:", dev->minor);
/* check that clock setting is valid */
if (it->options[3]) {
@@ -1655,7 +1655,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int das16_detach(struct comedi_device *dev)
{
- printk("comedi%d: das16: remove\n", dev->minor);
+ printk("%d: das16: remove\n", dev->minor);
das16_reset(dev);
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index c403d88..c8959a0 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -657,7 +657,7 @@ static int das16m1_attach(struct comedi_device *dev,
iobase = it->options[0];
- printk("comedi%d: das16m1:", dev->minor);
+ printk("%d: das16m1:", dev->minor);
ret = alloc_private(dev, sizeof(struct das16m1_private_struct));
if (ret < 0)
@@ -760,7 +760,7 @@ static int das16m1_attach(struct comedi_device *dev,
static int das16m1_detach(struct comedi_device *dev)
{
- printk("comedi%d: das16m1: remove\n", dev->minor);
+ printk("%d: das16m1: remove\n", dev->minor);
/* das16m1_reset(dev); */
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 6ea59cc..09bae51 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -618,7 +618,7 @@ static int das1800_attach(struct comedi_device *dev,
if (alloc_private(dev, sizeof(struct das1800_private)) < 0)
return -ENOMEM;
- printk("comedi%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,
+ printk("%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,
iobase);
if (irq) {
printk(", irq %u", irq);
@@ -802,7 +802,7 @@ static int das1800_detach(struct comedi_device *dev)
kfree(devpriv->ai_buf1);
}
- printk("comedi%d: %s: remove\n", dev->minor,
+ printk("%d: %s: remove\n", dev->minor,
driver_das1800.driver_name);
return 0;
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 92487f5..9034ac9 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -318,7 +318,7 @@ static int das6402_attach(struct comedi_device *dev,
if (iobase == 0)
iobase = 0x300;
- printk("comedi%d: das6402: 0x%04lx", dev->minor, iobase);
+ printk("%d: das6402: 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, DAS6402_SIZE, "das6402")) {
printk(" I/O port conflict\n");
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index ecb97cd..8f03910 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -456,7 +456,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long irq_flags;
int board;
- printk("comedi%d: das800: io 0x%lx", dev->minor, iobase);
+ printk("%d: das800: io 0x%lx", dev->minor, iobase);
if (irq) {
printk(", irq %u", irq);
}
@@ -548,7 +548,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int das800_detach(struct comedi_device *dev)
{
- printk("comedi%d: das800: remove\n", dev->minor);
+ printk("%d: das800: remove\n", dev->minor);
/* only free stuff if it has been allocated by _attach */
if (dev->iobase)
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index aeec1ee..bea7133 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -74,6 +74,8 @@ Configuration Options:
* options that are used with comedi_config.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/interrupt.h>
#include "../comedidev.h"
#include <linux/ioport.h>
@@ -336,12 +338,12 @@ static int dmm32at_attach(struct comedi_device *dev,
iobase = it->options[0];
irq = it->options[1];
- printk("comedi%d: dmm32at: attaching\n", dev->minor);
- printk("dmm32at: probing at address 0x%04lx, irq %u\n", iobase, irq);
+ pr_info("%d: attaching\n", dev->minor);
+ pr_info("probing at address 0x%04lx, irq %u\n", iobase, irq);
/* register address space */
if (!request_region(iobase, DMM32AT_MEMSIZE, thisboard->name)) {
- printk("I/O port conflict\n");
+ pr_info("I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -379,14 +381,14 @@ static int dmm32at_attach(struct comedi_device *dev,
intstat = dmm_inb(dev, DMM32AT_INTCLOCK);
airback = dmm_inb(dev, DMM32AT_AIRBACK);
- printk("dmm32at: lo=0x%02x hi=0x%02x fifostat=0x%02x\n",
- ailo, aihi, fifostat);
- printk("dmm32at: aistat=0x%02x intstat=0x%02x airback=0x%02x\n",
- aistat, intstat, airback);
+ pr_info("lo=0x%02x hi=0x%02x fifostat=0x%02x\n",
+ ailo, aihi, fifostat);
+ pr_info("aistat=0x%02x intstat=0x%02x airback=0x%02x\n",
+ aistat, intstat, airback);
if ((ailo != 0x00) || (aihi != 0x1f) || (fifostat != 0x80) ||
(aistat != 0x60 || (intstat != 0x00) || airback != 0x0c)) {
- printk("dmmat32: board detection failed\n");
+ pr_info("board detection failed\n");
return -EIO;
}
@@ -394,7 +396,7 @@ static int dmm32at_attach(struct comedi_device *dev,
if (irq) {
ret = request_irq(irq, dmm32at_isr, 0, thisboard->name, dev);
if (ret < 0) {
- printk("irq conflict\n");
+ pr_info("irq conflict\n");
return ret;
}
dev->irq = irq;
@@ -478,7 +480,7 @@ static int dmm32at_attach(struct comedi_device *dev,
}
/* success */
- printk("comedi%d: dmm32at: attached\n", dev->minor);
+ pr_info("%d: attached\n", dev->minor);
return 1;
@@ -494,7 +496,7 @@ static int dmm32at_attach(struct comedi_device *dev,
*/
static int dmm32at_detach(struct comedi_device *dev)
{
- printk("comedi%d: dmm32at: remove\n", dev->minor);
+ pr_info("%d: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
@@ -524,7 +526,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev,
chan = CR_CHAN(insn->chanspec) & (s->n_chan - 1);
range = CR_RANGE(insn->chanspec);
- /* printk("channel=0x%02x, range=%d\n",chan,range); */
+ /* pr_info("channel=0x%02x, range=%d\n", chan, range); */
/* zero scan and fifo control and reset fifo */
dmm_outb(dev, DMM32AT_FIFOCNTRL, DMM32AT_FIFORESET);
@@ -542,7 +544,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev,
break;
}
if (i == 40000) {
- printk("timeout\n");
+ pr_info("timeout\n");
return -ETIMEDOUT;
}
@@ -557,7 +559,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev,
break;
}
if (i == 40000) {
- printk("timeout\n");
+ pr_info("timeout\n");
return -ETIMEDOUT;
}
@@ -588,7 +590,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
int tmp;
int start_chan, gain, i;
- /* printk("dmmat32 in command test\n"); */
+ /* pr_info("in command test\n"); */
/* cmdtest tests a particular command to see if it is valid.
* Using the cmdtest ioctl, a user can create a valid cmd
@@ -810,7 +812,7 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
break;
}
if (i == 40000) {
- printk("timeout\n");
+ pr_info("timeout\n");
return -ETIMEDOUT;
}
@@ -823,7 +825,7 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
dmm_outb(dev, DMM32AT_CONV, 0xff);
}
-/* printk("dmmat32 in command\n"); */
+/* pr_info("in command\n"); */
/* for(i=0;i<cmd->chanlist_len;i++) */
/* comedi_buf_put(s->async,i*100); */
@@ -925,7 +927,7 @@ static int dmm32at_ao_winsn(struct comedi_device *dev,
lo = data[i] & 0x00ff;
/* high byte also contains channel number */
hi = (data[i] >> 8) + chan * (1 << 6);
- /* printk("writing 0x%02x 0x%02x\n",hi,lo); */
+ /* pr_info("writing 0x%02x 0x%02x\n", hi, lo); */
/* write the low and high values to the board */
dmm_outb(dev, DMM32AT_DACLSB, lo);
dmm_outb(dev, DMM32AT_DACMSB, hi);
@@ -937,7 +939,7 @@ static int dmm32at_ao_winsn(struct comedi_device *dev,
break;
}
if (i == 40000) {
- printk("timeout\n");
+ pr_info("timeout\n");
return -ETIMEDOUT;
}
/* dummy read to update trigger the output */
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index 51ef695..b98562b 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -377,7 +377,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0];
- printk("comedi%d: dt2811: base=0x%04lx\n", dev->minor, iobase);
+ printk("%d: dt2811: base=0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, DT2811_SIZE, driver_name)) {
printk("I/O port conflict\n");
@@ -540,7 +540,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dt2811_detach(struct comedi_device *dev)
{
- printk("comedi%d: dt2811: remove\n", dev->minor);
+ printk("%d: dt2811: remove\n", dev->minor);
if (dev->irq) {
free_irq(dev->irq, dev);
diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c
index 0364bbf..657fb80 100644
--- a/drivers/staging/comedi/drivers/dt2814.c
+++ b/drivers/staging/comedi/drivers/dt2814.c
@@ -256,7 +256,7 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: dt2814: 0x%04lx ", dev->minor, iobase);
+ printk("%d: dt2814: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2814_SIZE, "dt2814")) {
printk("I/O port conflict\n");
return -EIO;
@@ -337,7 +337,7 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dt2814_detach(struct comedi_device *dev)
{
- printk("comedi%d: dt2814: remove\n", dev->minor);
+ printk("%d: dt2814: remove\n", dev->minor);
if (dev->irq) {
free_irq(dev->irq, dev);
diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c
index d1db93c..ba1b891 100644
--- a/drivers/staging/comedi/drivers/dt2815.c
+++ b/drivers/staging/comedi/drivers/dt2815.c
@@ -191,7 +191,7 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: dt2815: 0x%04lx ", dev->minor, iobase);
+ printk("%d: dt2815: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2815_SIZE, "dt2815")) {
printk("I/O port conflict\n");
return -EIO;
@@ -260,7 +260,7 @@ static void dt2815_free_resources(struct comedi_device *dev)
static int dt2815_detach(struct comedi_device *dev)
{
- printk("comedi%d: dt2815: remove\n", dev->minor);
+ printk("%d: dt2815: remove\n", dev->minor);
dt2815_free_resources(dev);
diff --git a/drivers/staging/comedi/drivers/dt2817.c b/drivers/staging/comedi/drivers/dt2817.c
index 54e0dea..1a9fdd6 100644
--- a/drivers/staging/comedi/drivers/dt2817.c
+++ b/drivers/staging/comedi/drivers/dt2817.c
@@ -141,7 +141,7 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: dt2817: 0x%04lx ", dev->minor, iobase);
+ printk("%d: dt2817: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2817_SIZE, "dt2817")) {
printk("I/O port conflict\n");
return -EIO;
@@ -173,7 +173,7 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dt2817_detach(struct comedi_device *dev)
{
- printk("comedi%d: dt2817: remove\n", dev->minor);
+ printk("%d: dt2817: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, DT2817_SIZE);
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index a4c96c0..b7cb1b9 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -1294,7 +1294,7 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!iobase)
iobase = 0x240;
- printk("comedi%d: dt282x: 0x%04lx", dev->minor, iobase);
+ printk("%d: dt282x: 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, DT2821_SIZE, "dt282x")) {
printk(" I/O port conflict\n");
return -EBUSY;
@@ -1460,7 +1460,7 @@ static void free_resources(struct comedi_device *dev)
static int dt282x_detach(struct comedi_device *dev)
{
- printk("comedi%d: dt282x: remove\n", dev->minor);
+ printk("%d: dt282x: remove\n", dev->minor);
free_resources(dev);
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 312f4f2..626b76e 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -1071,7 +1071,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_write = &dt9812_ao_winsn;
s->insn_read = &dt9812_ao_rinsn;
- printk(KERN_INFO "comedi%d: successfully attached to dt9812.\n",
+ pr_info("%d: successfully attached to dt9812.\n",
dev->minor);
down(&dt9812_mutex);
@@ -1134,7 +1134,7 @@ static int __init usb_dt9812_init(void)
/* register with the USB subsystem */
result = usb_register(&dt9812_usb_driver);
if (result) {
- printk(KERN_ERR KBUILD_MODNAME
+ pr_err(KBUILD_MODNAME
": usb_register failed. Error number %d\n", result);
return result;
}
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index 8fca180..c7f96a4 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -16,6 +16,8 @@ Configuration options:
[0] - I/O port base address
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#define DEBUG 0
#include "../comedidev.h"
@@ -138,9 +140,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
Analog in, Analog out, ( not made ->and Digital IO) */
iobase = it->options[0];
- printk("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
+ pr_info("comedi:%d 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, FL512_SIZE, "fl512")) {
- printk(" I/O port conflict\n");
+ pr_cont(" I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -149,8 +151,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENOMEM;
#if DEBUG
- printk("malloc ok\n");
+ pr_cont("malloc ok");
#endif
+ pr_cont("\n");
if (alloc_subdevices(dev, 2) < 0)
return -ENOMEM;
@@ -166,7 +169,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->maxdata = 0x0fff; /* accept only 12 bits of data */
s->range_table = &range_fl512; /* device use one of the ranges */
s->insn_read = fl512_ai_insn; /* function to call when read AD */
- printk("comedi: fl512: subdevice 0 initialized\n");
+ pr_info("comedi: subdevice 0 initialized\n");
/* Analog output */
s = dev->subdevices + 1;
@@ -177,7 +180,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_fl512; /* device use one of the ranges */
s->insn_write = fl512_ao_insn; /* function to call when write DA */
s->insn_read = fl512_ao_insn_readback; /* function to call when reading DA */
- printk("comedi: fl512: subdevice 1 initialized\n");
+ pr_info("comedi: subdevice 1 initialized\n");
return 1;
}
@@ -186,6 +189,6 @@ static int fl512_detach(struct comedi_device *dev)
{
if (dev->iobase)
release_region(dev->iobase, FL512_SIZE);
- printk("comedi%d: fl512: dummy i detach\n", dev->minor);
+ pr_info("%d: dummy i detach\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 0bb3016..a6cb112 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -560,7 +560,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int i;
int retval;
- printk("comedi%d: gsc_hpdi\n", dev->minor);
+ printk("%d: gsc_hpdi\n", dev->minor);
if (alloc_private(dev, sizeof(struct hpdi_private)) < 0)
return -ENOMEM;
@@ -596,8 +596,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
pcidev->bus->number, PCI_SLOT(pcidev->devfn));
if (comedi_pci_enable(pcidev, driver_hpdi.driver_name)) {
- printk(KERN_WARNING
- " failed enable PCI device and request regions\n");
+ pr_warning(" failed enable PCI device and request regions\n");
return -EIO;
}
pci_set_master(pcidev);
@@ -672,7 +671,7 @@ static int hpdi_detach(struct comedi_device *dev)
{
unsigned int i;
- printk("comedi%d: gsc_hpdi: remove\n", dev->minor);
+ printk("%d: gsc_hpdi: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c
index 24df245..d5608e6 100644
--- a/drivers/staging/comedi/drivers/ii_pci20kc.c
+++ b/drivers/staging/comedi/drivers/ii_pci20kc.c
@@ -224,13 +224,13 @@ static int pci20xxx_attach(struct comedi_device *dev,
/* Check PCI-20001 C-2A Carrier Board ID */
if ((readb(devpriv->ioaddr) & PCI20000_ID) != PCI20000_ID) {
- printk("comedi%d: ii_pci20kc", dev->minor);
+ printk("%d: ii_pci20kc", dev->minor);
printk
(" PCI-20001 C-2A Carrier Board at base=0x%p not found !\n",
devpriv->ioaddr);
return -EINVAL;
}
- printk("comedi%d:\n", dev->minor);
+ printk("%d:\n", dev->minor);
printk("ii_pci20kc: PCI-20001 C-2A at base=0x%p\n", devpriv->ioaddr);
for (i = 0; i < PCI20000_MODULES; i++) {
@@ -244,7 +244,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
pci20006_init(dev, s, it->options[2 * i + 2],
it->options[2 * i + 3]);
- printk("comedi%d: ii_pci20kc", dev->minor);
+ printk("%d: ii_pci20kc", dev->minor);
printk(" PCI-20006 module in slot %d \n", i + 1);
break;
case PCI20341_ID:
@@ -252,7 +252,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
pci20341_init(dev, s, it->options[2 * i + 2],
it->options[2 * i + 3]);
- printk("comedi%d: ii_pci20kc", dev->minor);
+ printk("%d: ii_pci20kc", dev->minor);
printk(" PCI-20341 module in slot %d \n", i + 1);
break;
default:
@@ -274,7 +274,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
static int pci20xxx_detach(struct comedi_device *dev)
{
- printk("comedi%d: pci20xxx: remove\n", dev->minor);
+ printk("%d: pci20xxx: remove\n", dev->minor);
return 0;
}
@@ -448,7 +448,7 @@ static int pci20341_insn_read(struct comedi_device *dev,
}
if (j >= 100) {
printk
- ("comedi%d: pci20xxx: AI interrupt channel %i polling exit !\n",
+ ("%d: pci20xxx: AI interrupt channel %i polling exit !\n",
dev->minor, i);
return -EINVAL;
}
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 0d2c2eb..120b4db 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -778,7 +778,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
int opt_bus, opt_slot, i;
struct jr3_pci_dev_private *devpriv;
- printk("comedi%d: jr3_pci\n", dev->minor);
+ printk("%d: jr3_pci\n", dev->minor);
opt_bus = it->options[0];
opt_slot = it->options[1];
@@ -956,7 +956,7 @@ static int jr3_pci_detach(struct comedi_device *dev)
int i;
struct jr3_pci_dev_private *devpriv = dev->private;
- printk("comedi%d: jr3_pci: remove\n", dev->minor);
+ printk("%d: jr3_pci: remove\n", dev->minor);
if (devpriv) {
del_timer_sync(&devpriv->timer);
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index c145e82..10312bb 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -192,12 +192,12 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
}
- printk("comedi%d: no supported board found! (req. bus/slot: %d/%d)\n",
+ printk("%d: no supported board found! (req. bus/slot: %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
return -EIO;
found:
- printk("comedi%d: found %s at PCI bus %d, slot %d\n", dev->minor,
+ printk("%d: found %s at PCI bus %d, slot %d\n", dev->minor,
board->name, pci_device->bus->number,
PCI_SLOT(pci_device->devfn));
devpriv->pcidev = pci_device;
@@ -207,7 +207,7 @@ found:
error = comedi_pci_enable(pci_device, CNT_DRIVER_NAME);
if (error < 0) {
printk
- ("comedi%d: failed to enable PCI device and request regions!\n",
+ ("%d: failed to enable PCI device and request regions!\n",
dev->minor);
return error;
}
@@ -239,7 +239,7 @@ found:
outb(0, dev->iobase + 0x20);
outb(0, dev->iobase + 0x40);
- printk("comedi%d: " CNT_DRIVER_NAME " attached.\n", dev->minor);
+ printk("%d: " CNT_DRIVER_NAME " attached.\n", dev->minor);
return 0;
}
@@ -253,6 +253,6 @@ static int cnt_detach(struct comedi_device *dev)
}
pci_dev_put(devpriv->pcidev);
}
- printk("comedi%d: " CNT_DRIVER_NAME " remove\n", dev->minor);
+ printk("%d: " CNT_DRIVER_NAME " remove\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 6079913..1cf32f1 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -51,6 +51,8 @@ broken.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
+
#include <linux/interrupt.h>
#include "../comedidev.h"
@@ -301,9 +303,8 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (info->irq > 0) {
if (request_irq(info->irq, me4000_ai_isr,
IRQF_SHARED, "ME-4000", dev)) {
- printk
- ("comedi%d: me4000: me4000_attach(): Unable to allocate irq\n",
- dev->minor);
+ pr_warning("%d: Unable to allocate irq\n",
+ dev->minor);
} else {
dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ;
@@ -312,9 +313,8 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->do_cmd = me4000_ai_do_cmd;
}
} else {
- printk(KERN_WARNING
- "comedi%d: me4000: me4000_attach(): No interrupt available\n",
- dev->minor);
+ pr_warning("%d: No interrupt available\n",
+ dev->minor);
}
} else {
s->type = COMEDI_SUBD_UNUSED;
@@ -432,15 +432,13 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): No supported board found (req. bus/slot : %d/%d)\n",
+ pr_err("%d: No supported board found (req. bus/slot : %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
return -ENODEV;
found:
- printk(KERN_INFO
- "comedi%d: me4000: me4000_probe(): Found %s at PCI bus %d, slot %d\n",
+ pr_info("%d: Found %s at PCI bus %d, slot %d\n",
dev->minor, me4000_boards[i].name, pci_device->bus->number,
PCI_SLOT(pci_device->devfn));
@@ -450,8 +448,7 @@ found:
/* Enable PCI device and request regions */
result = comedi_pci_enable(pci_device, dev->board_name);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot enable PCI device and request I/O regions\n",
+ pr_err("%d: Cannot enable PCI device and request I/O regions\n",
dev->minor);
return result;
}
@@ -459,16 +456,14 @@ found:
/* Get the PCI base registers */
result = get_registers(dev, pci_device);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot get registers\n",
+ pr_err("%d: Cannot get registers\n",
dev->minor);
return result;
}
/* Initialize board info */
result = init_board_info(dev, pci_device);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot init baord info\n",
+ pr_err("%d: Cannot init baord info\n",
dev->minor);
return result;
}
@@ -476,8 +471,7 @@ found:
/* Init analog output context */
result = init_ao_context(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot init ao context\n",
+ pr_err("%d: Cannot init ao context\n",
dev->minor);
return result;
}
@@ -485,8 +479,7 @@ found:
/* Init analog input context */
result = init_ai_context(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot init ai context\n",
+ pr_err("%d: Cannot init ai context\n",
dev->minor);
return result;
}
@@ -494,8 +487,7 @@ found:
/* Init digital I/O context */
result = init_dio_context(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot init dio context\n",
+ pr_err("%d: Cannot init dio context\n",
dev->minor);
return result;
}
@@ -503,8 +495,7 @@ found:
/* Init counter context */
result = init_cnt_context(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Cannot init cnt context\n",
+ pr_err("%d: Cannot init cnt context\n",
dev->minor);
return result;
}
@@ -512,8 +503,7 @@ found:
/* Download the xilinx firmware */
result = xilinx_download(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Can't download firmware\n",
+ pr_err("%d: Can't download firmware\n",
dev->minor);
return result;
}
@@ -521,8 +511,7 @@ found:
/* Make a hardware reset */
result = reset_board(dev);
if (result) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_probe(): Can't reset board\n",
+ pr_err("%d: Can't reset board\n",
dev->minor);
return result;
}
@@ -539,8 +528,7 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
info->plx_regbase = pci_resource_start(pci_dev_p, 1);
if (info->plx_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): PCI base address 1 is not available\n",
+ pr_err("%d: PCI base address 1 is not available\n",
dev->minor);
return -ENODEV;
}
@@ -550,8 +538,7 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
info->me4000_regbase = pci_resource_start(pci_dev_p, 2);
if (info->me4000_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): PCI base address 2 is not available\n",
+ pr_err("%d: PCI base address 2 is not available\n",
dev->minor);
return -ENODEV;
}
@@ -561,8 +548,7 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
info->timer_regbase = pci_resource_start(pci_dev_p, 3);
if (info->timer_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): PCI base address 3 is not available\n",
+ pr_err("%d: PCI base address 3 is not available\n",
dev->minor);
return -ENODEV;
}
@@ -572,8 +558,7 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
info->program_regbase = pci_resource_start(pci_dev_p, 5);
if (info->program_regbase == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: get_registers(): PCI base address 5 is not available\n",
+ pr_err("%d: PCI base address 5 is not available\n",
dev->minor);
return -ENODEV;
}
@@ -799,8 +784,7 @@ static int xilinx_download(struct comedi_device *dev)
/* Wait until /INIT pin is set */
udelay(20);
if (!(inl(info->plx_regbase + PLX_INTCSR) & 0x20)) {
- printk(KERN_ERR
- "comedi%d: me4000: xilinx_download(): Can't init Xilinx\n",
+ pr_err("%d: Can't init Xilinx\n",
dev->minor);
return -EIO;
}
@@ -825,8 +809,7 @@ static int xilinx_download(struct comedi_device *dev)
/* Check if BUSY flag is low */
if (inl(info->plx_regbase + PLX_ICR) & 0x20) {
- printk(KERN_ERR
- "comedi%d: me4000: xilinx_download(): Xilinx is still busy (idx = %d)\n",
+ pr_err("%d: Xilinx is still busy (idx = %d)\n",
dev->minor, idx);
return -EIO;
}
@@ -836,11 +819,9 @@ static int xilinx_download(struct comedi_device *dev)
/* If done flag is high download was successful */
if (inl(info->plx_regbase + PLX_ICR) & 0x4) {
} else {
- printk(KERN_ERR
- "comedi%d: me4000: xilinx_download(): DONE flag is not set\n",
+ pr_err("%d: DONE flag is not set\n",
dev->minor);
- printk(KERN_ERR
- "comedi%d: me4000: xilinx_download(): Download not succesful\n",
+ pr_err("%d: Download not successful\n",
dev->minor);
return -EIO;
}
@@ -949,8 +930,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
if (insn->n == 0) {
return 0;
} else if (insn->n > 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Invalid instruction length %d\n",
+ pr_err("%d: Invalid instruction length %d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -969,8 +949,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
entry |= ME4000_AI_LIST_RANGE_BIPOLAR_10;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Invalid range specified\n",
+ pr_err("%d: Invalid range specified\n",
dev->minor);
return -EINVAL;
}
@@ -979,8 +958,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
case AREF_GROUND:
case AREF_COMMON:
if (chan >= thisboard->ai.count) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Analog input is not available\n",
+ pr_err("%d: Analog input is not available\n",
dev->minor);
return -EINVAL;
}
@@ -989,23 +967,20 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
case AREF_DIFF:
if (rang == 0 || rang == 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Range must be bipolar when aref = diff\n",
+ pr_err("%d: Range must be bipolar when aref = diff\n",
dev->minor);
return -EINVAL;
}
if (chan >= thisboard->ai.diff_count) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Analog input is not available\n",
+ pr_err("%d: Analog input is not available\n",
dev->minor);
return -EINVAL;
}
entry |= ME4000_AI_LIST_INPUT_DIFFERENTIAL | chan;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Invalid aref specified\n",
+ pr_err("%d: Invalid aref specified\n",
dev->minor);
return -EINVAL;
}
@@ -1044,8 +1019,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
if (!
(me4000_inl(dev, info->ai_context.status_reg) &
ME4000_AI_STATUS_BIT_EF_DATA)) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_insn_read(): Value not available after wait\n",
+ pr_err("%d: Value not available after wait\n",
dev->minor);
return -EIO;
}
@@ -1085,24 +1059,21 @@ static int ai_check_chanlist(struct comedi_device *dev,
/* Check whether a channel list is available */
if (!cmd->chanlist_len) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): No channel list available\n",
+ pr_err("%d: No channel list available\n",
dev->minor);
return -EINVAL;
}
/* Check the channel list size */
if (cmd->chanlist_len > ME4000_AI_CHANNEL_LIST_COUNT) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): Channel list is to large\n",
+ pr_err("%d: Channel list is to large\n",
dev->minor);
return -EINVAL;
}
/* Check the pointer */
if (!cmd->chanlist) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): NULL pointer to channel list\n",
+ pr_err("%d: NULL pointer to channel list\n",
dev->minor);
return -EFAULT;
}
@@ -1111,8 +1082,7 @@ static int ai_check_chanlist(struct comedi_device *dev,
aref = CR_AREF(cmd->chanlist[0]);
for (i = 0; i < cmd->chanlist_len; i++) {
if (CR_AREF(cmd->chanlist[i]) != aref) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): Mode is not equal for all entries\n",
+ pr_err("%d: Mode is not equal for all entries\n",
dev->minor);
return -EINVAL;
}
@@ -1123,8 +1093,7 @@ static int ai_check_chanlist(struct comedi_device *dev,
for (i = 0; i < cmd->chanlist_len; i++) {
if (CR_CHAN(cmd->chanlist[i]) >=
thisboard->ai.diff_count) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): Channel number to high\n",
+ pr_err("%d: Channel number too high\n",
dev->minor);
return -EINVAL;
}
@@ -1132,8 +1101,7 @@ static int ai_check_chanlist(struct comedi_device *dev,
} else {
for (i = 0; i < cmd->chanlist_len; i++) {
if (CR_CHAN(cmd->chanlist[i]) >= thisboard->ai.count) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): Channel number to high\n",
+ pr_err("%d: Channel number too high\n",
dev->minor);
return -EINVAL;
}
@@ -1145,8 +1113,7 @@ static int ai_check_chanlist(struct comedi_device *dev,
for (i = 0; i < cmd->chanlist_len; i++) {
if (CR_RANGE(cmd->chanlist[i]) != 1 &&
CR_RANGE(cmd->chanlist[i]) != 2) {
- printk(KERN_ERR
- "comedi%d: me4000: ai_check_chanlist(): Bipolar is not selected in differential mode\n",
+ pr_err("%d: Bipolar is not selected in differential mode\n",
dev->minor);
return -EINVAL;
}
@@ -1453,8 +1420,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
err++;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start source\n",
+ pr_err("%d: Invalid start source\n",
dev->minor);
cmd->start_src = TRIG_NOW;
err++;
@@ -1469,8 +1435,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
err++;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan begin source\n",
+ pr_err("%d: Invalid scan begin source\n",
dev->minor);
cmd->scan_begin_src = TRIG_FOLLOW;
err++;
@@ -1484,8 +1449,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
err++;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert source\n",
+ pr_err("%d: Invalid convert source\n",
dev->minor);
cmd->convert_src = TRIG_TIMER;
err++;
@@ -1499,8 +1463,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
err++;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end source\n",
+ pr_err("%d: Invalid scan end source\n",
dev->minor);
cmd->scan_end_src = TRIG_NONE;
err++;
@@ -1514,8 +1477,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
err++;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid stop source\n",
+ pr_err("%d: Invalid stop source\n",
dev->minor);
cmd->stop_src = TRIG_NONE;
err++;
@@ -1545,8 +1507,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
cmd->scan_begin_src == TRIG_EXT &&
cmd->convert_src == TRIG_EXT) {
} else {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start trigger combination\n",
+ pr_err("%d: Invalid start trigger combination\n",
dev->minor);
cmd->start_src = TRIG_NOW;
cmd->scan_begin_src = TRIG_FOLLOW;
@@ -1562,8 +1523,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
} else if (cmd->stop_src == TRIG_COUNT &&
cmd->scan_end_src == TRIG_COUNT) {
} else {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid stop trigger combination\n",
+ pr_err("%d: Invalid stop trigger combination\n",
dev->minor);
cmd->stop_src = TRIG_NONE;
cmd->scan_end_src = TRIG_NONE;
@@ -1576,29 +1536,25 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
* Stage 3. Check if arguments are generally valid.
*/
if (cmd->chanlist_len < 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): No channel list\n",
+ pr_err("%d: No channel list\n",
dev->minor);
cmd->chanlist_len = 1;
err++;
}
if (init_ticks < 66) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Start arg to low\n",
+ pr_err("%d: Start arg too low\n",
dev->minor);
cmd->start_arg = 2000;
err++;
}
if (scan_ticks && scan_ticks < 67) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Scan begin arg to low\n",
+ pr_err("%d: Scan begin arg too low\n",
dev->minor);
cmd->scan_begin_arg = 2031;
err++;
}
if (chan_ticks < 66) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Convert arg to low\n",
+ pr_err("%d: Convert arg too low\n",
dev->minor);
cmd->convert_arg = 2000;
err++;
@@ -1616,22 +1572,19 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
}
if (chan_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
+ pr_err("%d: Invalid convert arg\n",
dev->minor);
cmd->convert_arg = 2000; /* 66 ticks at least */
err++;
}
if (scan_ticks <= cmd->chanlist_len * chan_ticks) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n",
+ pr_err("%d: Invalid scan end arg\n",
dev->minor);
cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; /* At least one tick more */
err++;
@@ -1642,15 +1595,13 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
}
if (chan_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
+ pr_err("%d: Invalid convert arg\n",
dev->minor);
cmd->convert_arg = 2000; /* 66 ticks at least */
err++;
@@ -1661,22 +1612,19 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
}
if (chan_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
+ pr_err("%d: Invalid convert arg\n",
dev->minor);
cmd->convert_arg = 2000; /* 66 ticks at least */
err++;
}
if (scan_ticks <= cmd->chanlist_len * chan_ticks) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n",
+ pr_err("%d: Invalid scan end arg\n",
dev->minor);
cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; /* At least one tick more */
err++;
@@ -1687,15 +1635,13 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
}
if (chan_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
+ pr_err("%d: Invalid convert arg\n",
dev->minor);
cmd->convert_arg = 2000; /* 66 ticks at least */
err++;
@@ -1706,15 +1652,13 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
}
if (chan_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
+ pr_err("%d: Invalid convert arg\n",
dev->minor);
cmd->convert_arg = 2000; /* 66 ticks at least */
err++;
@@ -1725,8 +1669,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
/* Check timer arguments */
if (init_ticks < ME4000_AI_MIN_TICKS) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
+ pr_err("%d: Invalid start arg\n",
dev->minor);
cmd->start_arg = 2000; /* 66 ticks at least */
err++;
@@ -1734,8 +1677,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
}
if (cmd->stop_src == TRIG_COUNT) {
if (cmd->stop_arg == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid stop arg\n",
+ pr_err("%d: Invalid stop arg\n",
dev->minor);
cmd->stop_arg = 1;
err++;
@@ -1743,8 +1685,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
}
if (cmd->scan_end_src == TRIG_COUNT) {
if (cmd->scan_end_arg == 0) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n",
+ pr_err("%d: Invalid scan end arg\n",
dev->minor);
cmd->scan_end_arg = 1;
err++;
@@ -1785,8 +1726,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
/* Check if irq number is right */
if (irq != ai_context->irq) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): Incorrect interrupt num: %d\n",
+ pr_err("%d: Incorrect interrupt num: %d\n",
dev->minor, irq);
return IRQ_HANDLED;
}
@@ -1814,8 +1754,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): FIFO overflow\n",
+ pr_err("%d: FIFO overflow\n",
dev->minor);
} else if ((tmp & ME4000_AI_STATUS_BIT_FF_DATA)
&& !(tmp & ME4000_AI_STATUS_BIT_HF_DATA)
@@ -1826,8 +1765,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
c = ME4000_AI_FIFO_COUNT / 2;
} else {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): Can't determine state of fifo\n",
+ pr_err("%d: Can't determine state of fifo\n",
dev->minor);
c = 0;
@@ -1839,8 +1777,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): Undefined FIFO state\n",
+ pr_err("%d: Undefined FIFO state\n",
dev->minor);
}
@@ -1860,8 +1797,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
s->async->events |= COMEDI_CB_OVERFLOW;
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): Buffer overflow\n",
+ pr_err("%d: Buffer overflow\n",
dev->minor);
break;
@@ -1896,8 +1832,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
lval ^= 0x8000;
if (!comedi_buf_put(s->async, lval)) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ai_isr(): Buffer overflow\n",
+ pr_err("%d: Buffer overflow\n",
dev->minor);
s->async->events |= COMEDI_CB_OVERFLOW;
break;
@@ -1940,29 +1875,25 @@ static int me4000_ao_insn_write(struct comedi_device *dev,
if (insn->n == 0) {
return 0;
} else if (insn->n > 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ao_insn_write(): Invalid instruction length %d\n",
+ pr_err("%d: Invalid instruction length %d\n",
dev->minor, insn->n);
return -EINVAL;
}
if (chan >= thisboard->ao.count) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ao_insn_write(): Invalid channel %d\n",
+ pr_err("%d: Invalid channel %d\n",
dev->minor, insn->n);
return -EINVAL;
}
if (rang != 0) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ao_insn_write(): Invalid range %d\n",
+ pr_err("%d: Invalid range %d\n",
dev->minor, insn->n);
return -EINVAL;
}
if (aref != AREF_GROUND && aref != AREF_COMMON) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_ao_insn_write(): Invalid aref %d\n",
+ pr_err("%d: Invalid aref %d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -1994,7 +1925,7 @@ static int me4000_ao_insn_read(struct comedi_device *dev,
return 0;
} else if (insn->n > 1) {
printk
- ("comedi%d: me4000: me4000_ao_insn_read(): Invalid instruction length\n",
+ ("%d: Invalid instruction length\n",
dev->minor);
return -EINVAL;
}
@@ -2021,7 +1952,7 @@ static int me4000_dio_insn_bits(struct comedi_device *dev,
if (insn->n != 2) {
printk
- ("comedi%d: me4000: me4000_dio_insn_bits(): Invalid instruction length\n",
+ ("%d: Invalid instruction length\n",
dev->minor);
return -EINVAL;
}
@@ -2178,8 +2109,7 @@ static int cnt_reset(struct comedi_device *dev, unsigned int channel)
me4000_outb(dev, 0x00, info->cnt_context.counter_2_reg);
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: cnt_reset(): Invalid channel\n",
+ pr_err("%d: Invalid channel\n",
dev->minor);
return -EINVAL;
}
@@ -2205,8 +2135,7 @@ static int cnt_config(struct comedi_device *dev, unsigned int channel,
tmp |= ME4000_CNT_COUNTER_2;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: cnt_config(): Invalid channel\n",
+ pr_err("%d: Invalid channel\n",
dev->minor);
return -EINVAL;
}
@@ -2231,8 +2160,7 @@ static int cnt_config(struct comedi_device *dev, unsigned int channel,
tmp |= ME4000_CNT_MODE_5;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: cnt_config(): Invalid counter mode\n",
+ pr_err("%d: Invalid counter mode\n",
dev->minor);
return -EINVAL;
}
@@ -2256,8 +2184,7 @@ static int me4000_cnt_insn_config(struct comedi_device *dev,
switch (data[0]) {
case GPCT_RESET:
if (insn->n != 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_config(): Invalid instruction length%d\n",
+ pr_err("%d: Invalid instruction length%d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -2268,8 +2195,7 @@ static int me4000_cnt_insn_config(struct comedi_device *dev,
break;
case GPCT_SET_OPERATION:
if (insn->n != 2) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_config(): Invalid instruction length%d\n",
+ pr_err("%d: Invalid instruction length%d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -2279,8 +2205,7 @@ static int me4000_cnt_insn_config(struct comedi_device *dev,
return err;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_config(): Invalid instruction\n",
+ pr_err("%d: Invalid instruction\n",
dev->minor);
return -EINVAL;
}
@@ -2301,8 +2226,7 @@ static int me4000_cnt_insn_read(struct comedi_device *dev,
return 0;
if (insn->n > 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_read(): Invalid instruction length %d\n",
+ pr_err("%d: Invalid instruction length %d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -2327,8 +2251,7 @@ static int me4000_cnt_insn_read(struct comedi_device *dev,
data[0] |= tmp << 8;
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_read(): Invalid channel %d\n",
+ pr_err("%d: Invalid channel %d\n",
dev->minor, insn->chanspec);
return -EINVAL;
}
@@ -2348,8 +2271,7 @@ static int me4000_cnt_insn_write(struct comedi_device *dev,
if (insn->n == 0) {
return 0;
} else if (insn->n > 1) {
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_write(): Invalid instruction length %d\n",
+ pr_err("%d: Invalid instruction length %d\n",
dev->minor, insn->n);
return -EINVAL;
}
@@ -2374,8 +2296,7 @@ static int me4000_cnt_insn_write(struct comedi_device *dev,
me4000_outb(dev, tmp, info->cnt_context.counter_2_reg);
break;
default:
- printk(KERN_ERR
- "comedi%d: me4000: me4000_cnt_insn_write(): Invalid channel %d\n",
+ pr_err("%d: Invalid channel %d\n",
dev->minor, insn->chanspec);
return -EINVAL;
}
diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 733b192..4cdd2bf 100644
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -35,28 +35,28 @@
#ifdef ME4000_CALL_DEBUG
#undef CALL_PDEBUG
-#define CALL_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
+#define CALL_PDEBUG(fmt, args...) printk(KERN_DEBUG"%d: me4000: " fmt, dev->minor, ##args)
#else
# define CALL_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif
#ifdef ME4000_PORT_DEBUG
#undef PORT_PDEBUG
-#define PORT_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
+#define PORT_PDEBUG(fmt, args...) printk(KERN_DEBUG"%d: me4000: " fmt, dev->minor, ##args)
#else
#define PORT_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif
#ifdef ME4000_ISR_DEBUG
#undef ISR_PDEBUG
-#define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
+#define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"%d: me4000: " fmt, dev->minor, ##args)
#else
#define ISR_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif
#ifdef ME4000_DEBUG
#undef PDEBUG
-#define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
+#define PDEBUG(fmt, args...) printk(KERN_DEBUG"%d: me4000: " fmt, dev->minor, ##args)
#else
#define PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 2cda7ad..131e761 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -421,7 +421,7 @@ static int me_ai_insn_read(struct comedi_device *dev,
(readw(dev_private->me_regbase +
ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
} else {
- printk(KERN_ERR "comedi%d: Cannot get single value\n",
+ pr_err("%d: Cannot get single value\n",
dev->minor);
return -EIO;
}
@@ -603,7 +603,7 @@ static int me2600_xilinx_download(struct comedi_device *dev,
if (value & 0x20) {
/* Disable interrupt */
writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
- printk(KERN_ERR "comedi%d: Xilinx download failed\n",
+ pr_err("%d: Xilinx download failed\n",
dev->minor);
return -EIO;
}
@@ -693,20 +693,18 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
}
- printk(KERN_ERR
- "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+ pr_err("%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
return -EIO;
found:
- printk(KERN_INFO "comedi%d: found %s at PCI bus %d, slot %d\n",
+ pr_info("%d: found %s at PCI bus %d, slot %d\n",
dev->minor, me_boards[i].name,
pci_device->bus->number, PCI_SLOT(pci_device->devfn));
/* Enable PCI device and request PCI regions */
if (comedi_pci_enable(pci_device, ME_DRIVER_NAME) < 0) {
- printk(KERN_ERR "comedi%d: Failed to enable PCI device and "
- "request regions\n", dev->minor);
+ pr_err("%d: Failed to enable PCI device and request regions\n", dev->minor);
return -EIO;
}
@@ -720,7 +718,7 @@ found:
ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
dev_private->plx_regbase_size = plx_regbase_size_tmp;
if (!dev_private->plx_regbase) {
- printk("comedi%d: Failed to remap I/O memory\n", dev->minor);
+ printk("%d: Failed to remap I/O memory\n", dev->minor);
return -ENOMEM;
}
@@ -730,11 +728,11 @@ found:
swap_regbase_size_tmp = pci_resource_len(pci_device, 5);
if (!swap_regbase_tmp)
- printk(KERN_ERR "comedi%d: Swap not present\n", dev->minor);
+ pr_err("%d: Swap not present\n", dev->minor);
/*---------------------------------------------- Workaround start ---*/
if (plx_regbase_tmp & 0x0080) {
- printk(KERN_ERR "comedi%d: PLX-Bug detected\n", dev->minor);
+ pr_err("%d: PLX-Bug detected\n", dev->minor);
if (swap_regbase_tmp) {
regbase_tmp = plx_regbase_tmp;
@@ -770,7 +768,7 @@ found:
dev_private->me_regbase_size = me_regbase_size_tmp;
dev_private->me_regbase = ioremap(me_regbase_tmp, me_regbase_size_tmp);
if (!dev_private->me_regbase) {
- printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
+ pr_err("%d: Failed to remap I/O memory\n",
dev->minor);
return -ENOMEM;
}
@@ -831,7 +829,7 @@ found:
subdevice->insn_config = me_dio_insn_config;
subdevice->io_bits = 0;
- printk(KERN_INFO "comedi%d: " ME_DRIVER_NAME " attached.\n",
+ pr_info("%d: " ME_DRIVER_NAME " attached.\n",
dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index cb4da2a..e1da658 100644
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -168,7 +168,7 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: mpc624 [0x%04lx, ", dev->minor, iobase);
+ printk("%d: mpc624 [0x%04lx, ", dev->minor, iobase);
if (request_region(iobase, MPC624_SIZE, "mpc624") == NULL) {
printk("I/O port(s) in use\n");
return -EIO;
@@ -261,7 +261,7 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int mpc624_detach(struct comedi_device *dev)
{
- printk("comedi%d: mpc624: remove\n", dev->minor);
+ printk("%d: mpc624: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, MPC624_SIZE);
diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c
index 440a144..77ded5c 100644
--- a/drivers/staging/comedi/drivers/mpc8260cpm.c
+++ b/drivers/staging/comedi/drivers/mpc8260cpm.c
@@ -71,7 +71,7 @@ static int mpc8260cpm_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
int i;
- printk("comedi%d: mpc8260cpm: ", dev->minor);
+ printk("%d: mpc8260cpm: ", dev->minor);
dev->board_ptr = mpc8260cpm_boards + dev->board;
@@ -99,7 +99,7 @@ static int mpc8260cpm_attach(struct comedi_device *dev,
static int mpc8260cpm_detach(struct comedi_device *dev)
{
- printk("comedi%d: mpc8260cpm: remove\n", dev->minor);
+ printk("%d: mpc8260cpm: remove\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 5d6af9c..28b7d29 100644
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -253,9 +253,9 @@ static int multiq3_attach(struct comedi_device *dev,
struct comedi_subdevice *s;
iobase = it->options[0];
- printk("comedi%d: multiq3: 0x%04lx ", dev->minor, iobase);
+ printk("%d: multiq3: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) {
- printk("comedi%d: I/O port conflict\n", dev->minor);
+ printk("%d: I/O port conflict\n", dev->minor);
return -EIO;
}
@@ -263,9 +263,9 @@ static int multiq3_attach(struct comedi_device *dev,
irq = it->options[1];
if (irq) {
- printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
+ printk("%d: irq = %u ignored\n", dev->minor, irq);
} else {
- printk("comedi%d: no irq\n", dev->minor);
+ printk("%d: no irq\n", dev->minor);
}
dev->board_name = "multiq3";
result = alloc_subdevices(dev, 5);
@@ -330,7 +330,7 @@ static int multiq3_attach(struct comedi_device *dev,
static int multiq3_detach(struct comedi_device *dev)
{
- printk("comedi%d: multiq3: remove\n", dev->minor);
+ printk("%d: multiq3: remove\n", dev->minor);
if (dev->iobase) {
release_region(dev->iobase, MULTIQ3_SIZE);
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index b37ef37..40095c9 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -377,7 +377,7 @@ static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
int ret;
- printk("comedi%d: ni6527:", dev->minor);
+ printk("%d: ni6527:", dev->minor);
ret = alloc_private(dev, sizeof(struct ni6527_private));
if (ret < 0)
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index bbf75eb..660caed 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -652,7 +652,7 @@ static int ni_65xx_attach(struct comedi_device *dev,
unsigned i;
int ret;
- printk("comedi%d: ni_65xx:", dev->minor);
+ printk("%d: ni_65xx:", dev->minor);
ret = alloc_private(dev, sizeof(struct ni_65xx_private));
if (ret < 0)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 404d3c5..9c1d582 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1036,7 +1036,7 @@ static int ni_660x_attach(struct comedi_device *dev,
unsigned i;
unsigned global_interrupt_config_bits;
- printk("comedi%d: ni_660x: ", dev->minor);
+ printk("%d: ni_660x: ", dev->minor);
ret = ni_660x_allocate_private(dev);
if (ret < 0)
@@ -1155,7 +1155,7 @@ static int ni_660x_attach(struct comedi_device *dev,
static int ni_660x_detach(struct comedi_device *dev)
{
- printk("comedi%d: ni_660x: remove\n", dev->minor);
+ printk("%d: ni_660x: remove\n", dev->minor);
/* Free irq */
if (dev->irq)
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 9b43547..a31f9ea 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -151,7 +151,7 @@ static int ni_670x_attach(struct comedi_device *dev,
int ret;
int i;
- printk("comedi%d: ni_670x: ", dev->minor);
+ printk("%d: ni_670x: ", dev->minor);
ret = alloc_private(dev, sizeof(struct ni_670x_private));
if (ret < 0)
@@ -217,7 +217,7 @@ static int ni_670x_attach(struct comedi_device *dev,
static int ni_670x_detach(struct comedi_device *dev)
{
- printk("comedi%d: ni_670x: remove\n", dev->minor);
+ printk("%d: ni_670x: remove\n", dev->minor);
if (dev->subdevices[0].range_table_list) {
kfree(dev->subdevices[0].range_table_list);
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index dd75dfb..9327280 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -334,7 +334,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static const int timeout = 2000;
int i;
- printk("comedi%d: %s: io 0x%lx", dev->minor, driver_a2150.driver_name,
+ printk("%d: %s: io 0x%lx", dev->minor, driver_a2150.driver_name,
iobase);
if (irq) {
printk(", irq %u", irq);
@@ -453,7 +453,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int a2150_detach(struct comedi_device *dev)
{
- printk("comedi%d: %s: remove\n", dev->minor, driver_a2150.driver_name);
+ printk("%d: %s: remove\n", dev->minor, driver_a2150.driver_name);
/* only free stuff if it has been allocated by _attach */
if (dev->iobase) {
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 8adb237..058b29a 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -225,7 +225,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = 0x1c0;
ao_unipolar = it->options[3];
- printk("comedi%d: ni_at_ao: 0x%04lx", dev->minor, iobase);
+ printk("%d: ni_at_ao: 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, ATAO_SIZE, "ni_at_ao")) {
printk(" I/O port conflict\n");
@@ -289,7 +289,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int atao_detach(struct comedi_device *dev)
{
- printk("comedi%d: atao: remove\n", dev->minor);
+ printk("%d: atao: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, ATAO_SIZE);
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 8ead311..d8030bc 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -443,7 +443,7 @@ static int ni_atmio_attach(struct comedi_device *dev,
/* reserve our I/O region */
- printk("comedi%d: ni_atmio: 0x%04lx", dev->minor, iobase);
+ printk("%d: ni_atmio: 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, NI_SIZE, "ni_atmio")) {
printk(" I/O port conflict\n");
return -EIO;
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index 901833d..46c9d28 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -35,6 +35,8 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/interrupt.h>
#include "../comedidev.h"
@@ -279,7 +281,7 @@ static irqreturn_t atmio16d_interrupt(int irq, void *d)
struct comedi_device *dev = d;
struct comedi_subdevice *s = dev->subdevices + 0;
-/* printk("atmio16d_interrupt!\n"); */
+/* pr_info("%s!\n", __func__); */
comedi_buf_put(s->async, inw(dev->iobase + AD_FIFO_REG));
@@ -293,7 +295,7 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev,
{
int err = 0, tmp;
#ifdef DEBUG1
- printk("atmio16d_ai_cmdtest\n");
+ pr_info("%s\n", __func__);
#endif
/* make sure triggers are valid */
tmp = cmd->start_src;
@@ -397,7 +399,7 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
unsigned int sample_count, tmp, chan, gain;
int i;
#ifdef DEBUG1
- printk("atmio16d_ai_cmd\n");
+ pr_info("%s\n", __func__);
#endif
/* This is slowly becoming a working command interface. *
* It is still uber-experimental */
@@ -559,7 +561,7 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
int status;
#ifdef DEBUG1
- printk("atmio16d_ai_insn_read\n");
+ pr_info("%s\n", __func__);
#endif
chan = CR_CHAN(insn->chanspec);
gain = CR_RANGE(insn->chanspec);
@@ -580,7 +582,7 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
/* check conversion status */
status = inw(dev->iobase + STAT_REG);
#ifdef DEBUG1
- printk("status=%x\n", status);
+ pr_info("status=%x\n", status);
#endif
if (status & STAT_AD_CONVAVAIL) {
/* read the data now */
@@ -592,7 +594,7 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
break;
}
if (status & STAT_AD_OVERFLOW) {
- printk("atmio16d: a/d FIFO overflow\n");
+ pr_info("a/d FIFO overflow\n");
outw(0, dev->iobase + AD_CLEAR_REG);
return -ETIME;
@@ -600,7 +602,7 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
}
/* end waiting, now check if it timed out */
if (t == ATMIO16D_TIMEOUT) {
- printk("atmio16d: timeout\n");
+ pr_info("timeout\n");
return -ETIME;
}
@@ -615,7 +617,7 @@ static int atmio16d_ao_insn_read(struct comedi_device *dev,
{
int i;
#ifdef DEBUG1
- printk("atmio16d_ao_insn_read\n");
+ pr_info("%s\n", __func__);
#endif
for (i = 0; i < insn->n; i++) {
@@ -633,7 +635,7 @@ static int atmio16d_ao_insn_write(struct comedi_device *dev,
int chan;
int d;
#ifdef DEBUG1
- printk("atmio16d_ao_insn_write\n");
+ pr_info("%s\n", __func__);
#endif
chan = CR_CHAN(insn->chanspec);
@@ -745,9 +747,9 @@ static int atmio16d_attach(struct comedi_device *dev,
/* make sure the address range is free and allocate it */
iobase = it->options[0];
- printk("comedi%d: atmio16d: 0x%04lx ", dev->minor, iobase);
+ pr_info("%d: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, ATMIO16D_SIZE, "ni_atmio16d")) {
- printk("I/O port conflict\n");
+ pr_cont("I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -772,13 +774,13 @@ static int atmio16d_attach(struct comedi_device *dev,
ret = request_irq(irq, atmio16d_interrupt, 0, "atmio16d", dev);
if (ret < 0) {
- printk("failed to allocate irq %u\n", irq);
+ pr_cont("failed to allocate irq %u\n", irq);
return ret;
}
dev->irq = irq;
- printk("( irq = %u )\n", irq);
+ pr_cont("( irq = %u )\n", irq);
} else {
- printk("( no irq )");
+ pr_cont("( no irq )");
}
/* set device options */
@@ -867,16 +869,17 @@ static int atmio16d_attach(struct comedi_device *dev,
/* do */
s->type = COMEDI_SUBD_TIMER;
s->n_chan = 0;
- s->maxdata = 0
+ s->maxdata = 0;
#endif
- printk("\n");
+
+ pr_cont("\n");
return 0;
}
static int atmio16d_detach(struct comedi_device *dev)
{
- printk("comedi%d: atmio16d: remove\n", dev->minor);
+ pr_info("%d: remove\n", dev->minor);
if (dev->subdevices && boardtype->has_8255)
subdev_8255_cleanup(dev, dev->subdevices + 3);
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index ec31a39..175ac23 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -387,7 +387,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EINVAL;
break;
}
- printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,
+ printk("%d: ni_daq_700: %s, io 0x%lx", dev->minor,
thisboard->name, iobase);
#ifdef incomplete
if (irq) {
@@ -423,7 +423,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dio700_detach(struct comedi_device *dev)
{
- printk("comedi%d: ni_daq_700: cs-remove\n", dev->minor);
+ printk("%d: ni_daq_700: cs-remove\n", dev->minor);
if (dev->subdevices)
subdev_700_cleanup(dev, dev->subdevices + 0);
@@ -508,7 +508,7 @@ static int dio700_cs_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
- printk(KERN_INFO "ni_daq_700: cs-attach\n");
+ pr_info("ni_daq_700: cs-attach\n");
DEBUG(0, "dio700_cs_attach()\n");
@@ -553,7 +553,7 @@ static int dio700_cs_attach(struct pcmcia_device *link)
static void dio700_cs_detach(struct pcmcia_device *link)
{
- printk(KERN_INFO "ni_daq_700: cs-detach!\n");
+ pr_info("ni_daq_700: cs-detach!\n");
DEBUG(0, "dio700_cs_detach(0x%p)\n", link);
@@ -587,7 +587,7 @@ static void dio700_config(struct pcmcia_device *link)
memreq_t map;
cistpl_cftable_entry_t dflt = { 0 };
- printk(KERN_INFO "ni_daq_700: cs-config\n");
+ pr_info("ni_daq_700: cs-config\n");
DEBUG(0, "dio700_config(0x%p)\n", link);
@@ -746,7 +746,7 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
+ pr_info("%s: index 0x%02x",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %d", link->irq.AssignedIRQ);
@@ -764,7 +764,7 @@ next_entry:
return;
cs_failed:
- printk(KERN_INFO "ni_daq_700 cs failed");
+ pr_info("ni_daq_700 cs failed");
dio700_release(link);
} /* dio700_config */
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 0700a8b..1215437 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -37,6 +37,8 @@ This is just a wrapper around the 8255.o driver to properly handle
the PCMCIA interface.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
/* #define LABPC_DEBUG *//* enable debugging messages */
#undef LABPC_DEBUG
@@ -134,22 +136,22 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
#endif
break;
default:
- printk("bug! couldn't determine board type\n");
+ pr_err("bug! couldn't determine board type\n");
return -EINVAL;
break;
}
- printk("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
- thisboard->name, iobase);
+ pr_info("%d: ni_daq_dio24: %s, io 0x%lx",
+ dev->minor, thisboard->name, iobase);
#ifdef incomplete
if (irq) {
- printk(", irq %u", irq);
+ pr_cont(", irq %u", irq);
}
#endif
- printk("\n");
+ pr_cont("\n");
if (iobase == 0) {
- printk("io base address is zero!\n");
+ pr_err("io base address is zero!\n");
return -EINVAL;
}
@@ -174,7 +176,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dio24_detach(struct comedi_device *dev)
{
- printk("comedi%d: ni_daq_dio24: remove\n", dev->minor);
+ pr_info("%d: ni_daq_dio24: remove\n", dev->minor);
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 0);
@@ -259,7 +261,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
- printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - CS-attach!\n");
+ pr_info("HOLA SOY YO - CS-attach!\n");
DEBUG(0, "dio24_cs_attach()\n");
@@ -304,7 +306,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
static void dio24_cs_detach(struct pcmcia_device *link)
{
- printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - cs-detach!\n");
+ pr_info("HOLA SOY YO - cs-detach!\n");
DEBUG(0, "dio24_cs_detach(0x%p)\n", link);
@@ -338,7 +340,7 @@ static void dio24_config(struct pcmcia_device *link)
memreq_t map;
cistpl_cftable_entry_t dflt = { 0 };
- printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO! - config\n");
+ pr_info("HOLA SOY YO! - config\n");
DEBUG(0, "dio24_config(0x%p)\n", link);
@@ -498,25 +500,25 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
+ pr_info("%s: index 0x%02x",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
- printk(", irq %d", link->irq.AssignedIRQ);
+ pr_cont(", irq %d", link->irq.AssignedIRQ);
if (link->io.NumPorts1)
- printk(", io 0x%04x-0x%04x", link->io.BasePort1,
- link->io.BasePort1 + link->io.NumPorts1 - 1);
+ pr_cont(", io 0x%04x-0x%04x", link->io.BasePort1,
+ link->io.BasePort1 + link->io.NumPorts1 - 1);
if (link->io.NumPorts2)
- printk(" & 0x%04x-0x%04x", link->io.BasePort2,
- link->io.BasePort2 + link->io.NumPorts2 - 1);
+ pr_cont(" & 0x%04x-0x%04x", link->io.BasePort2,
+ link->io.BasePort2 + link->io.NumPorts2 - 1);
if (link->win)
- printk(", mem 0x%06lx-0x%06lx", req.Base,
- req.Base + req.Size - 1);
- printk("\n");
+ pr_cont(", mem 0x%06lx-0x%06lx", req.Base,
+ req.Base + req.Size - 1);
+ pr_cont("\n");
return;
cs_failed:
- printk(KERN_INFO "Fallo");
+ pr_info("Fallo");
dio24_release(link);
} /* dio24_config */
@@ -581,7 +583,7 @@ struct pcmcia_driver dio24_cs_driver = {
static int __init init_dio24_cs(void)
{
- printk("ni_daq_dio24: HOLA SOY YO!\n");
+ pr_info("HOLA SOY YO!\n");
DEBUG(0, "%s\n", version);
pcmcia_register_driver(&dio24_cs_driver);
return 0;
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index dc3f398..0cd3abe 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -481,7 +481,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
unsigned long dma_flags, isr_flags;
short lsb, msb;
- printk("comedi%d: ni_labpc: %s, io 0x%lx", dev->minor, thisboard->name,
+ printk("%d: ni_labpc: %s, io 0x%lx", dev->minor, thisboard->name,
iobase);
if (irq) {
printk(", irq %u", irq);
@@ -740,7 +740,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot)
int labpc_common_detach(struct comedi_device *dev)
{
- printk("comedi%d: ni_labpc: detach\n", dev->minor);
+ printk("%d: ni_labpc: detach\n", dev->minor);
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2);
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index a3053b8..2eddcae 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -469,7 +469,7 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
+ pr_info("%s: index 0x%02x",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %d", link->irq.AssignedIRQ);
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index 9aef87f..a5a2c6d 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -347,7 +347,7 @@ static void mio_cs_config(struct pcmcia_device *link)
manfid = le16_to_cpu(buf[0]);
prodid = le16_to_cpu(buf[1]);
}
- /* printk("manfid = 0x%04x, 0x%04x\n",manfid,prodid); */
+ /* pr_info("manfid = 0x%04x, 0x%04x\n",manfid,prodid); */
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
tuple.Attributes = 0;
@@ -356,17 +356,17 @@ static void mio_cs_config(struct pcmcia_device *link)
ret = pcmcia_parse_tuple(&tuple, &parse);
#if 0
- printk(" index: 0x%x\n", parse.cftable_entry.index);
- printk(" flags: 0x%x\n", parse.cftable_entry.flags);
- printk(" io flags: 0x%x\n", parse.cftable_entry.io.flags);
- printk(" io nwin: 0x%x\n", parse.cftable_entry.io.nwin);
- printk(" io base: 0x%x\n", parse.cftable_entry.io.win[0].base);
- printk(" io len: 0x%x\n", parse.cftable_entry.io.win[0].len);
- printk(" irq1: 0x%x\n", parse.cftable_entry.irq.IRQInfo1);
- printk(" irq2: 0x%x\n", parse.cftable_entry.irq.IRQInfo2);
- printk(" mem flags: 0x%x\n", parse.cftable_entry.mem.flags);
- printk(" mem nwin: 0x%x\n", parse.cftable_entry.mem.nwin);
- printk(" subtuples: 0x%x\n", parse.cftable_entry.subtuples);
+ pr_info(" index: 0x%x\n", parse.cftable_entry.index);
+ pr_info(" flags: 0x%x\n", parse.cftable_entry.flags);
+ pr_info(" io flags: 0x%x\n", parse.cftable_entry.io.flags);
+ pr_info(" io nwin: 0x%x\n", parse.cftable_entry.io.nwin);
+ pr_info(" io base: 0x%x\n", parse.cftable_entry.io.win[0].base);
+ pr_info(" io len: 0x%x\n", parse.cftable_entry.io.win[0].len);
+ pr_info(" irq1: 0x%x\n", parse.cftable_entry.irq.IRQInfo1);
+ pr_info(" irq2: 0x%x\n", parse.cftable_entry.irq.IRQInfo2);
+ pr_info(" mem flags: 0x%x\n", parse.cftable_entry.mem.flags);
+ pr_info(" mem nwin: 0x%x\n", parse.cftable_entry.mem.nwin);
+ pr_info(" subtuples: 0x%x\n", parse.cftable_entry.subtuples);
#endif
#if 0
@@ -384,7 +384,7 @@ static void mio_cs_config(struct pcmcia_device *link)
for (base = 0x000; base < 0x400; base += 0x20) {
link->io.BasePort1 = base;
ret = pcmcia_request_io(link, &link->io);
- /* printk("RequestIO 0x%02x\n",ret); */
+ /* pr_info("RequestIO 0x%02x\n",ret); */
if (!ret)
break;
}
@@ -394,14 +394,14 @@ static void mio_cs_config(struct pcmcia_device *link)
link->irq.IRQInfo2 = parse.cftable_entry.irq.IRQInfo2;
ret = pcmcia_request_irq(link, &link->irq);
if (ret) {
- printk("pcmcia_request_irq() returned error: %i\n", ret);
+ pr_info("pcmcia_request_irq() returned error: %i\n", ret);
}
- /* printk("RequestIRQ 0x%02x\n",ret); */
+ /* pr_info("RequestIRQ 0x%02x\n",ret); */
link->conf.ConfigIndex = 1;
ret = pcmcia_request_configuration(link, &link->conf);
- /* printk("RequestConfiguration %d\n",ret); */
+ /* pr_info("RequestConfiguration %d\n",ret); */
link->dev_node = &dev_node;
}
@@ -423,36 +423,36 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq = link->irq.AssignedIRQ;
- printk("comedi%d: %s: DAQCard: io 0x%04lx, irq %u, ",
+ pr_info("%d: %s: DAQCard: io 0x%04lx, irq %u, ",
dev->minor, dev->driver->driver_name, dev->iobase, irq);
#if 0
{
int i;
- printk(" board fingerprint:");
+ pr_info(" board fingerprint:");
for (i = 0; i < 32; i += 2) {
- printk(" %04x %02x", inw(dev->iobase + i),
- inb(dev->iobase + i + 1));
+ pr_cont(" %04x %02x", inw(dev->iobase + i),
+ inb(dev->iobase + i + 1));
}
- printk("\n");
- printk(" board fingerprint (windowed):");
+ pr_cont("\n");
+ pr_info(" board fingerprint (windowed):");
for (i = 0; i < 10; i++) {
- printk(" 0x%04x", win_in(i));
+ pr_cont(" 0x%04x", win_in(i));
}
- printk("\n");
+ pr_cont("\n");
}
#endif
dev->board_ptr = ni_boards + ni_getboardtype(dev, link);
- printk(" %s", boardtype.name);
+ pr_info(" %s", boardtype.name);
dev->board_name = boardtype.name;
ret = request_irq(irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
"ni_mio_cs", dev);
if (ret < 0) {
- printk(" irq not available\n");
+ pr_cont(" irq not available\n");
return -EINVAL;
}
dev->irq = irq;
@@ -508,7 +508,7 @@ static int ni_getboardtype(struct comedi_device *dev,
}
}
- printk("unknown board 0x%04x -- pretend it is a ", id);
+ pr_cont("unknown board 0x%04x -- pretend it is a ", id);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 52b2eca..4dbe3b6 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1173,7 +1173,7 @@ static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int n_subdevices;
unsigned int irq;
- printk("comedi%d: nidio:", dev->minor);
+ printk("%d: nidio:", dev->minor);
if ((ret = alloc_private(dev, sizeof(struct nidio96_private))) < 0)
return ret;
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 24c8b8e..4eef72c 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1650,7 +1650,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
int ret;
- printk("comedi%d: ni_pcimio:", dev->minor);
+ printk("%d: ni_pcimio:", dev->minor);
ret = ni_alloc_private(dev);
if (ret < 0)
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index dd9db06..4e4dd3b 100644
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -273,7 +273,7 @@ static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
goto ok;
udelay(1);
}
- printk("comedi%d: pcl711: A/D timeout\n", dev->minor);
+ printk("%d: pcl711: A/D timeout\n", dev->minor);
return -ETIME;
ok:
@@ -508,7 +508,7 @@ static int pcl711_do_insn_bits(struct comedi_device *dev,
/* Free any resources that we have claimed */
static int pcl711_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcl711: remove\n", dev->minor);
+ printk("%d: pcl711: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
@@ -530,7 +530,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* claim our I/O space */
iobase = it->options[0];
- printk("comedi%d: pcl711: 0x%04lx ", dev->minor, iobase);
+ printk("%d: pcl711: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCL711_SIZE, "pcl711")) {
printk("I/O port conflict\n");
return -EIO;
diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c
index df1f4ef..e6e9a27 100644
--- a/drivers/staging/comedi/drivers/pcl724.c
+++ b/drivers/staging/comedi/drivers/pcl724.c
@@ -138,7 +138,7 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if ((this_board->can_have96) && ((it->options[1] == 1)
|| (it->options[1] == 96)))
iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */
- printk("comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor,
+ printk("%d: pcl724: board=%s, 0x%03lx ", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, iorange, "pcl724")) {
printk("I/O port conflict\n");
@@ -207,7 +207,7 @@ static int pcl724_detach(struct comedi_device *dev)
{
int i;
-/* printk("comedi%d: pcl724: remove\n",dev->minor); */
+/* printk("%d: pcl724: remove\n",dev->minor); */
for (i = 0; i < dev->n_subdevices; i++) {
subdev_8255_cleanup(dev, dev->subdevices + i);
diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c
index 1da4941..80b3df5 100644
--- a/drivers/staging/comedi/drivers/pcl725.c
+++ b/drivers/staging/comedi/drivers/pcl725.c
@@ -66,7 +66,7 @@ static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: pcl725: 0x%04lx ", dev->minor, iobase);
+ printk("%d: pcl725: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCL725_SIZE, "pcl725")) {
printk("I/O port conflict\n");
return -EIO;
@@ -103,7 +103,7 @@ static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int pcl725_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcl725: remove\n", dev->minor);
+ printk("%d: pcl725: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, PCL725_SIZE);
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c
index ccadd09..5ab1107 100644
--- a/drivers/staging/comedi/drivers/pcl726.c
+++ b/drivers/staging/comedi/drivers/pcl726.c
@@ -256,7 +256,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0];
iorange = this_board->io_range;
- printk("comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor,
+ printk("%d: pcl726: board=%s, 0x%03lx ", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, iorange, "pcl726")) {
printk("I/O port conflict\n");
@@ -369,7 +369,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int pcl726_detach(struct comedi_device *dev)
{
-/* printk("comedi%d: pcl726: remove\n",dev->minor); */
+/* printk("%d: pcl726: remove\n",dev->minor); */
#ifdef ACL6126_IRQ
if (dev->irq) {
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index c9859c9..e51b00c 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -99,7 +99,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0];
iorange = this_board->io_range;
- printk("comedi%d: pcl730: board=%s 0x%04lx ", dev->minor,
+ printk("%d: pcl730: board=%s 0x%04lx ", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, iorange, "pcl730")) {
printk("I/O port conflict\n");
@@ -159,7 +159,7 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int pcl730_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcl730: remove\n", dev->minor);
+ printk("%d: pcl730: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, this_board->io_range);
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 0b51a48..afe4639 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -478,7 +478,7 @@ static int pcl812_ai_insn_read(struct comedi_device *dev,
udelay(1);
}
printk
- ("comedi%d: pcl812: (%s at 0x%lx) A/D insn read timeout\n",
+ ("%d: pcl812: (%s at 0x%lx) A/D insn read timeout\n",
dev->minor, dev->board_name, dev->iobase);
outb(devpriv->mode_reg_int | 0, dev->iobase + PCL812_MODE);
return -ETIME;
@@ -512,7 +512,7 @@ static int acl8216_ai_insn_read(struct comedi_device *dev,
udelay(1);
}
printk
- ("comedi%d: pcl812: (%s at 0x%lx) A/D insn read timeout\n",
+ ("%d: pcl812: (%s at 0x%lx) A/D insn read timeout\n",
dev->minor, dev->board_name, dev->iobase);
outb(0, dev->iobase + PCL812_MODE);
return -ETIME;
@@ -981,7 +981,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
if (err) {
printk
- ("comedi%d: pcl812: (%s at 0x%lx) A/D cmd IRQ without DRDY!\n",
+ ("%d: pcl812: (%s at 0x%lx) A/D cmd IRQ without DRDY!\n",
dev->minor, dev->board_name, dev->iobase);
pcl812_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
@@ -1309,7 +1309,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int n_subdevices;
iobase = it->options[0];
- printk("comedi%d: pcl812: board=%s, ioport=0x%03lx", dev->minor,
+ printk("%d: pcl812: board=%s, ioport=0x%03lx", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, this_board->io_range, "pcl812")) {
@@ -1642,7 +1642,7 @@ static int pcl812_detach(struct comedi_device *dev)
{
#ifdef PCL812_EXTDEBUG
- printk("comedi%d: pcl812: remove\n", dev->minor);
+ printk("%d: pcl812: remove\n", dev->minor);
#endif
free_resources(dev);
return 0;
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index fa24145..4207608 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -898,7 +898,7 @@ check_and_setup_channel_list(struct comedi_device *dev,
if (nowmustbechan != CR_CHAN(chanlist[i])) {
/* channel list isn't continous :-( */
printk
- ("comedi%d: pcl816: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n",
+ ("%d: pcl816: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n",
dev->minor, i, CR_CHAN(chanlist[i]),
nowmustbechan, CR_CHAN(chanlist[0]));
return 0;
@@ -914,7 +914,7 @@ check_and_setup_channel_list(struct comedi_device *dev,
CR_RANGE(chanlist[i]));)
if (chanlist[i] != chansegment[i % seglen]) {
printk
- ("comedi%d: pcl816: bad channel or range number! chanlist[%i]=%d,%d,%d and not %d,%d,%d!\n",
+ ("%d: pcl816: bad channel or range number! chanlist[%i]=%d,%d,%d and not %d,%d,%d!\n",
dev->minor, i, CR_CHAN(chansegment[i]),
CR_RANGE(chansegment[i]),
CR_AREF(chansegment[i]),
@@ -1032,7 +1032,7 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* claim our I/O space */
iobase = it->options[0];
- printk("comedi%d: pcl816: board=%s, ioport=0x%03lx", dev->minor,
+ printk("%d: pcl816: board=%s, ioport=0x%03lx", dev->minor,
this_board->name, iobase);
if (!request_region(iobase, this_board->io_range, "pcl816")) {
@@ -1248,7 +1248,7 @@ case COMEDI_SUBD_DO:
*/
static int pcl816_detach(struct comedi_device *dev)
{
- DEBUG(printk("comedi%d: pcl816: remove\n", dev->minor);)
+ DEBUG(printk("%d: pcl816: remove\n", dev->minor);)
free_resources(dev);
#ifdef unused
if (devpriv->dma_rtc)
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index e95229b..c4fcfad 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -1212,7 +1212,7 @@ static int check_channel_list(struct comedi_device *dev,
(CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continous :-( */
printk
- ("comedi%d: pcl818: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n",
+ ("%d: pcl818: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n",
dev->minor, i, CR_CHAN(chanlist[i]),
nowmustbechan, CR_CHAN(chanlist[0]));
return 0;
@@ -1226,7 +1226,7 @@ static int check_channel_list(struct comedi_device *dev,
/* printk("%d %d=%d %d\n",CR_CHAN(chansegment[i%seglen]),CR_RANGE(chansegment[i%seglen]),CR_CHAN(it->chanlist[i]),CR_RANGE(it->chanlist[i])); */
if (chanlist[i] != chansegment[i % seglen]) {
printk
- ("comedi%d: pcl818: bad channel or range number! chanlist[%i]=%d,%d,%d and not %d,%d,%d!\n",
+ ("%d: pcl818: bad channel or range number! chanlist[%i]=%d,%d,%d and not %d,%d,%d!\n",
dev->minor, i, CR_CHAN(chansegment[i]),
CR_RANGE(chansegment[i]),
CR_AREF(chansegment[i]),
@@ -1726,7 +1726,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* claim our I/O space */
iobase = it->options[0];
- printk("comedi%d: pcl818: board=%s, ioport=0x%03lx",
+ printk("%d: pcl818: board=%s, ioport=0x%03lx",
dev->minor, this_board->name, iobase);
devpriv->io_range = this_board->io_range;
if ((this_board->fifo) && (it->options[2] == -1)) { /* we've board with FIFO and we want to use FIFO */
@@ -2016,7 +2016,7 @@ no_dma:
*/
static int pcl818_detach(struct comedi_device *dev)
{
- /* printk("comedi%d: pcl818: remove\n", dev->minor); */
+ /* printk("%d: pcl818: remove\n", dev->minor); */
free_resources(dev);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c
index 5281182..1e3568d 100644
--- a/drivers/staging/comedi/drivers/pcm3724.c
+++ b/drivers/staging/comedi/drivers/pcm3724.c
@@ -272,7 +272,7 @@ static int pcm3724_attach(struct comedi_device *dev,
((struct priv_pcm3724 *)(dev->private))->dio_1 = 0;
((struct priv_pcm3724 *)(dev->private))->dio_2 = 0;
- printk("comedi%d: pcm3724: board=%s, 0x%03lx ", dev->minor,
+ printk("%d: pcm3724: board=%s, 0x%03lx ", dev->minor,
this_board->name, iobase);
if (!iobase || !request_region(iobase, iorange, "pcm3724")) {
printk("I/O port conflict\n");
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c
index 9e4adbd..e51c22a 100644
--- a/drivers/staging/comedi/drivers/pcm3730.c
+++ b/drivers/staging/comedi/drivers/pcm3730.c
@@ -73,7 +73,7 @@ static int pcm3730_attach(struct comedi_device *dev,
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: pcm3730: 0x%04lx ", dev->minor, iobase);
+ printk("%d: pcm3730: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCM3730_SIZE, "pcm3730")) {
printk("I/O port conflict\n");
return -EIO;
@@ -147,7 +147,7 @@ static int pcm3730_attach(struct comedi_device *dev,
static int pcm3730_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcm3730: remove\n", dev->minor);
+ printk("%d: pcm3730: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, PCM3730_SIZE);
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index acac670..feda512 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -41,6 +41,8 @@ Configuration options:
1 = two's complement
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/interrupt.h>
#include "../comedidev.h"
@@ -135,11 +137,13 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+ pr_info("%d: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
- printk("I/O port conflict\n");
+ pr_cont("I/O port conflict\n");
return -EIO;
}
+ pr_cont("\n");
+
dev->iobase = iobase;
ret = alloc_subdevices(dev, 1);
@@ -166,7 +170,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int pcmad_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcmad: remove\n", dev->minor);
+ pr_info("%d: pcmad: remove\n", dev->minor);
if (dev->irq) {
free_irq(dev->irq, dev);
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c
index 7133eb0..259b5f9 100644
--- a/drivers/staging/comedi/drivers/pcmda12.c
+++ b/drivers/staging/comedi/drivers/pcmda12.c
@@ -157,7 +157,7 @@ static int pcmda12_attach(struct comedi_device *dev,
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: %s: io: %lx %s ", dev->minor, driver.driver_name,
+ printk("%d: %s: io: %lx %s ", dev->minor, driver.driver_name,
iobase, it->options[1] ? "simultaneous xfer mode enabled" : "");
if (!request_region(iobase, IOSIZE, driver.driver_name)) {
@@ -222,7 +222,7 @@ static int pcmda12_attach(struct comedi_device *dev,
*/
static int pcmda12_detach(struct comedi_device *dev)
{
- printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
+ printk("%d: %s: remove\n", dev->minor, driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, IOSIZE);
return 0;
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index d812c2c..c3dd2a6 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -336,7 +336,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0];
irq[0] = it->options[1];
- printk("comedi%d: %s: io: %lx ", dev->minor, driver.driver_name,
+ printk("%d: %s: io: %lx ", dev->minor, driver.driver_name,
iobase);
dev->iobase = iobase;
@@ -535,7 +535,7 @@ static int pcmmio_detach(struct comedi_device *dev)
{
int i;
- printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
+ printk("%d: %s: remove\n", dev->minor, driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, thisboard->total_iosize);
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index c1ae20f..dc53e00 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -294,7 +294,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq[0] = it->options[1];
irq[1] = it->options[2];
- printk("comedi%d: %s: io: %lx ", dev->minor, driver.driver_name,
+ pr_info("%d: %s: io: %lx ", dev->minor, driver.driver_name,
iobase);
dev->iobase = iobase;
@@ -302,7 +302,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!iobase || !request_region(iobase,
thisboard->num_asics * ASIC_IOSIZE,
driver.driver_name)) {
- printk("I/O port conflict\n");
+ pr_cont("I/O port conflict\n");
return -EIO;
}
@@ -317,7 +317,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcmuio_private)) < 0) {
- printk("cannot allocate private data structure\n");
+ pr_cont("cannot allocate private data structure\n");
return -ENOMEM;
}
@@ -336,7 +336,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
kcalloc(n_subdevs, sizeof(struct pcmuio_subdev_private),
GFP_KERNEL);
if (!devpriv->sprivs) {
- printk("cannot allocate subdevice private data structures\n");
+ pr_cont("cannot allocate subdevice private data structures\n");
return -ENOMEM;
}
/*
@@ -347,7 +347,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* 96-channel version of the board.
*/
if (alloc_subdevices(dev, n_subdevs) < 0) {
- printk("cannot allocate subdevice data structures\n");
+ pr_cont("cannot allocate subdevice data structures\n");
return -ENOMEM;
}
@@ -435,14 +435,14 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irqs.. */
if (irq[0]) {
- printk("irq: %u ", irq[0]);
+ pr_cont("irq: %u ", irq[0]);
if (irq[1] && thisboard->num_asics == 2)
- printk("second ASIC irq: %u ", irq[1]);
+ pr_cont("second ASIC irq: %u ", irq[1]);
} else {
- printk("(IRQ mode disabled) ");
+ pr_cont("(IRQ mode disabled) ");
}
- printk("attached\n");
+ pr_cont("attached\n");
return 1;
}
@@ -459,7 +459,7 @@ static int pcmuio_detach(struct comedi_device *dev)
{
int i;
- printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
+ pr_info("%d: %s: remove\n", dev->minor, driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, ASIC_IOSIZE * thisboard->num_asics);
@@ -500,7 +500,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("write mask: %08x data: %08x\n", data[0], data[1]);
+ pr_info("write mask: %08x data: %08x\n", data[0], data[1]);
#endif
s->state = 0;
@@ -521,10 +521,9 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk
- ("byte %d wmb %02x db %02x offset %02d io %04x, data_in %02x ",
- byte_no, (unsigned)write_mask_byte, (unsigned)data_byte,
- offset, ioaddr, (unsigned)byte);
+ pr_info("byte %d wmb %02x db %02x offset %02d io %04x, data_in %02x ",
+ byte_no, (unsigned)write_mask_byte, (unsigned)data_byte,
+ offset, ioaddr, (unsigned)byte);
#endif
if (write_mask_byte) {
@@ -536,7 +535,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
}
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("data_out_byte %02x\n", (unsigned)byte);
+ pr_cont("data_out_byte %02x\n", (unsigned)byte);
#endif
/* save the digital input lines for this byte.. */
s->state |= ((unsigned int)byte) << offset;
@@ -547,7 +546,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("s->state %08x data_out %08x\n", s->state, data[1]);
+ pr_info("s->state %08x data_out %08x\n", s->state, data[1]);
#endif
return 2;
@@ -749,9 +748,8 @@ static irqreturn_t interrupt_pcmuio(int irq, void *d)
if (triggered) {
struct comedi_subdevice *s;
/* TODO here: dispatch io lines to subdevs with commands.. */
- printk
- ("PCMUIO DEBUG: got edge detect interrupt %d asic %d which_chans: %06x\n",
- irq, asic, triggered);
+ pr_info("PCMUIO DEBUG: got edge detect interrupt %d asic %d which_chans: %06x\n",
+ irq, asic, triggered);
for (s = dev->subdevices;
s < dev->subdevices + dev->n_subdevices;
++s) {
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index d23e588..ec353c6 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -122,7 +122,7 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned int iosize;
iobase = it->options[0];
- printk("comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
+ printk("%d: poc: using %s iobase 0x%lx\n", dev->minor,
this_board->name, iobase);
dev->board_name = this_board->name;
@@ -169,7 +169,7 @@ static int poc_detach(struct comedi_device *dev)
if (dev->iobase)
release_region(dev->iobase, this_board->iosize);
- printk("comedi%d: dac02: remove\n", dev->minor);
+ printk("%d: dac02: remove\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 344b823..6369e12 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -47,6 +47,8 @@ Status: works
Devices: [Quatech] DAQP-208 (daqp), DAQP-308
*/
+#define pr_fmt(fmt) "daqp: " fmt
+
#include "../comedidev.h"
#include <pcmcia/cs_types.h>
@@ -210,24 +212,14 @@ static struct comedi_driver driver_daqp = {
static void daqp_dump(struct comedi_device *dev)
{
- printk("DAQP: status %02x; aux status %02x\n",
- inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
+ pr_info("status %02x; aux status %02x\n",
+ inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
}
static void hex_dump(char *str, void *ptr, int len)
{
- unsigned char *cptr = ptr;
- int i;
-
- printk(str);
-
- for (i = 0; i < len; i++) {
- if (i % 16 == 0) {
- printk("\n0x%08x:", (unsigned int)cptr);
- }
- printk(" %02x", *(cptr++));
- }
- printk("\n");
+ print_hex_dump(KERN_INFO, str, DUMP_PREFIX_ADDRESS,
+ 16, 1, ptr, len, true);
}
#endif
@@ -271,33 +263,30 @@ static void daqp_interrupt(int irq, void *dev_id)
int status;
if (local == NULL) {
- printk(KERN_WARNING
- "daqp_interrupt(): irq %d for unknown device.\n", irq);
+ pr_warning("%s(): irq %d for unknown device.\n", __func__, irq);
return;
}
dev = local->dev;
if (dev == NULL) {
- printk(KERN_WARNING "daqp_interrupt(): NULL comedi_device.\n");
+ pr_warning("%s(): NULL comedi_device.\n", __func__);
return;
}
if (!dev->attached) {
- printk(KERN_WARNING
- "daqp_interrupt(): struct comedi_device not yet attached.\n");
+ pr_warning("%s(): struct comedi_device not yet attached.\n",
+ __func__);
return;
}
s = local->s;
if (s == NULL) {
- printk(KERN_WARNING
- "daqp_interrupt(): NULL comedi_subdevice.\n");
+ pr_warning("%s(): NULL comedi_subdevice.\n", __func__);
return;
}
if ((struct local_info_t *)s->private != local) {
- printk(KERN_WARNING
- "daqp_interrupt(): invalid comedi_subdevice.\n");
+ pr_warning("%s(): invalid comedi_subdevice.\n", __func__);
return;
}
@@ -347,8 +336,7 @@ static void daqp_interrupt(int irq, void *dev_id)
}
if (loop_limit <= 0) {
- printk(KERN_WARNING
- "loop_limit reached in daqp_interrupt()\n");
+ pr_warning("%s(): loop_limit reached\n", __func__);
daqp_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
}
@@ -868,7 +856,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) {
- printk("comedi%d: No such daqp device %d\n",
+ printk("%d: No such daqp device %d\n",
dev->minor, it->options[0]);
return -EIO;
}
@@ -915,7 +903,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret < 0)
return ret;
- printk("comedi%d: attaching daqp%d (io 0x%04lx)\n",
+ printk("%d: attaching daqp%d (io 0x%04lx)\n",
dev->minor, it->options[0], dev->iobase);
s = dev->subdevices + 0;
@@ -968,7 +956,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int daqp_detach(struct comedi_device *dev)
{
- printk("comedi%d: detaching daqp\n", dev->minor);
+ printk("%d: detaching daqp\n", dev->minor);
return 0;
}
@@ -1064,7 +1052,7 @@ static int daqp_cs_attach(struct pcmcia_device *link)
if (dev_table[i] == NULL)
break;
if (i == MAX_DEV) {
- printk(KERN_NOTICE "daqp_cs: no devices available\n");
+ pr_notice("no devices available\n");
return -ENODEV;
}
@@ -1282,17 +1270,18 @@ next_entry:
link->dev_node = &dev->node;
/* Finally, report what we've done */
- printk(KERN_INFO "%s: index 0x%02x",
- dev->node.dev_name, link->conf.ConfigIndex);
+ pr_info("%s: index 0x%02x",
+ dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
- printk(", irq %u", link->irq.AssignedIRQ);
+ pr_cont(", irq %u", link->irq.AssignedIRQ);
if (link->io.NumPorts1)
- printk(", io 0x%04x-0x%04x", link->io.BasePort1,
- link->io.BasePort1 + link->io.NumPorts1 - 1);
+ pr_cont(", io 0x%04x-0x%04x",
+ link->io.BasePort1,
+ link->io.BasePort1 + link->io.NumPorts1 - 1);
if (link->io.NumPorts2)
- printk(" & 0x%04x-0x%04x", link->io.BasePort2,
- link->io.BasePort2 + link->io.NumPorts2 - 1);
- printk("\n");
+ pr_cont(" & 0x%04x-0x%04x", link->io.BasePort2,
+ link->io.BasePort2 + link->io.NumPorts2 - 1);
+ pr_cont("\n");
return;
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index f35cce5..a9644ef 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -761,7 +761,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int index;
#endif
- printk("comedi%d: rtd520 attaching.\n", dev->minor);
+ printk("%d: rtd520 attaching.\n", dev->minor);
#if defined (CONFIG_COMEDI_DEBUG) && defined (USE_DMA)
/* You can set this a load time: modprobe comedi comedi_debug=1 */
@@ -1102,7 +1102,7 @@ static int rtd_detach(struct comedi_device *dev)
int index;
#endif
- DPRINTK("comedi%d: rtd520: removing (%ld ints)\n",
+ DPRINTK("%d: rtd520: removing (%ld ints)\n",
dev->minor, (devpriv ? devpriv->intCount : 0L));
if (devpriv && devpriv->lcfg) {
DPRINTK
@@ -1176,7 +1176,7 @@ static int rtd_detach(struct comedi_device *dev)
}
}
- printk("comedi%d: rtd520: removed.\n", dev->minor);
+ printk("%d: rtd520: removed.\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 2c9d05b..c5ecd9d 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -336,7 +336,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
iobase = it->options[0];
- printk("comedi%d: rti800: 0x%04lx ", dev->minor, iobase);
+ printk("%d: rti800: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, RTI800_SIZE, "rti800")) {
printk("I/O port conflict\n");
return -EIO;
@@ -468,7 +468,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int rti800_detach(struct comedi_device *dev)
{
- printk("comedi%d: rti800: remove\n", dev->minor);
+ printk("%d: rti800: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, RTI800_SIZE);
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index 2f75c73..5f55419 100644
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -106,7 +106,7 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk("comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
+ printk("%d: rti802: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, RTI802_SIZE, "rti802")) {
printk("I/O port conflict\n");
return -EIO;
@@ -145,7 +145,7 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int rti802_detach(struct comedi_device *dev)
{
- printk("comedi%d: rti802: remove\n", dev->minor);
+ printk("%d: rti802: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, RTI802_SIZE);
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index 07c21e6..1f2bdd1 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -304,7 +304,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* int subdev_channel = 0; */
union cmReg cmReg;
- printk("comedi%d: s526: ", dev->minor);
+ printk("%d: s526: ", dev->minor);
iobase = it->options[0];
if (!iobase || !request_region(iobase, S526_IOSIZE, thisboard->name)) {
@@ -494,7 +494,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int s526_detach(struct comedi_device *dev)
{
- printk("comedi%d: s526: remove\n", dev->minor);
+ printk("%d: s526: remove\n", dev->minor);
if (dev->iobase > 0)
release_region(dev->iobase, S526_IOSIZE);
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 80d2787..5a2ae73 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2167,7 +2167,7 @@ static int s626_dio_insn_bits(struct comedi_device *dev,
if (insn->n != 2) {
printk
- ("comedi%d: s626: s626_dio_insn_bits(): Invalid instruction length\n",
+ ("%d: s626: s626_dio_insn_bits(): Invalid instruction length\n",
dev->minor);
return -EINVAL;
}
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 82aa86e..17c7f0f 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -814,7 +814,7 @@ static int serial2002_attach(struct comedi_device *dev,
{
struct comedi_subdevice *s;
- printk("comedi%d: serial2002: ", dev->minor);
+ printk("%d: serial2002: ", dev->minor);
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct serial2002_private)) < 0) {
return -ENOMEM;
@@ -882,7 +882,7 @@ static int serial2002_detach(struct comedi_device *dev)
struct comedi_subdevice *s;
int i;
- printk("comedi%d: serial2002: remove\n", dev->minor);
+ printk("%d: serial2002: remove\n", dev->minor);
for (i = 0; i < 4; i++) {
s = &dev->subdevices[i];
if (s->maxdata_list) {
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index 3dee62a..b4dcdac 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -211,7 +211,7 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
- printk("comedi%d: skel: ", dev->minor);
+ printk("%d: skel: ", dev->minor);
/*
* If you can probe the device to determine what device in a series
@@ -297,7 +297,7 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int skel_detach(struct comedi_device *dev)
{
- printk("comedi%d: skel: remove\n", dev->minor);
+ printk("%d: skel: remove\n", dev->minor);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index 4918fbf..8709d92 100644
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -122,7 +122,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
- printk("comedi%d: dnp: ", dev->minor);
+ printk("%d: dnp: ", dev->minor);
/* Autoprobing: this should find out which board we have. Currently only */
/* the 1486 board is supported and autoprobing is not implemented :-) */
@@ -190,7 +190,7 @@ static int dnp_detach(struct comedi_device *dev)
outb((inb(CSCDR) & 0xAA), CSCDR);
/* announce that we are finished */
- printk("comedi%d: dnp: remove\n", dev->minor);
+ printk("%d: dnp: remove\n", dev->minor);
return 0;
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 75a9a62..773bfe2 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -140,13 +140,12 @@ 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");
+ pr_err("your card must has at least 2 'g01' subdevices\n");
return -1;
}
if (alloc_subdevices(dev, n_subd) < 0) {
- printk(KERN_ERR "out of memory\n");
+ pr_err("out of memory\n");
return -ENOMEM;
}
@@ -215,16 +214,14 @@ 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",
+ pr_err("%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",
+ pr_err("%d: undefined channel %d. channel range is 0 .. 23\n",
dev->minor, channel);
return -1;
}
@@ -240,7 +237,7 @@ static int unioxx5_insn_config(struct comedi_device *dev,
flags |= mask;
break;
default:
- printk(KERN_ERR "comedi%d: unknown flag\n", dev->minor);
+ pr_err("%d: unknown flag\n", dev->minor);
return -1;
}
@@ -280,19 +277,19 @@ 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);
+ pr_err("%d: I/O port conflict\n", minor);
return -EIO;
}
usp = (struct unioxx5_subd_priv *)kzalloc(sizeof(*usp), GFP_KERNEL);
if (usp == NULL) {
- printk(KERN_ERR "comedi%d: erorr! --> out of memory!\n", minor);
+ pr_err("%d: erorr! --> out of memory!\n", minor);
return -1;
}
usp->usp_iobase = subdev_iobase;
- printk("comedi%d: |", minor);
+ printk("%d: |", minor);
/* defining modules types */
for (i = 0; i < 12; i++) {
@@ -348,8 +345,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("%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
return 0;
}
@@ -375,8 +371,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("%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
return 0;
}
@@ -418,8 +413,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("%d: module in position %d with id 0x%0x is for input only!\n",
minor, module, usp->usp_module_type[module]);
return 0;
}
@@ -454,8 +448,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("%d: module in position %d with id 0x%02x is for output only",
minor, module_no, usp->usp_module_type[module_no]);
return 0;
}
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index cca4e86..0437258 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -421,7 +421,7 @@ static void usbduxsub_ai_IsocIrq(struct urb *urb)
/* we don't copy the data into the transfer buffer */
/* and recycle the last data byte */
dev_dbg(&urb->dev->dev,
- "comedi%d: usbdux: CRC error in ISO IN stream.\n",
+ "%d: usbdux: CRC error in ISO IN stream.\n",
this_usbduxsub->comedidev->minor);
break;
@@ -887,7 +887,7 @@ static int usbduxsub_submit_InURBs(struct usbduxsub *usbduxsub)
usbduxsub->urbIn[i]->status = 0;
usbduxsub->urbIn[i]->transfer_flags = URB_ISO_ASAP;
dev_dbg(&usbduxsub->interface->dev,
- "comedi%d: submitting in-urb[%d]: %p,%p intv=%d\n",
+ "%d: submitting in-urb[%d]: %p,%p intv=%d\n",
usbduxsub->comedidev->minor, i,
(usbduxsub->urbIn[i]->context),
(usbduxsub->urbIn[i]->dev),
@@ -940,7 +940,7 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
return -ENODEV;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_cmdtest\n", dev->minor);
+ "%d: usbdux_ai_cmdtest\n", dev->minor);
/* make sure triggers are valid */
/* Only immediate triggers are allowed */
@@ -1100,7 +1100,7 @@ static int send_dux_commands(struct usbduxsub *this_usbduxsub, int cmd_type)
this_usbduxsub->dux_commands[0] = cmd_type;
#ifdef NOISY_DUX_DEBUGBUG
- printk(KERN_DEBUG "comedi%d: usbdux: dux_commands: ",
+ printk(KERN_DEBUG "%d: usbdux: dux_commands: ",
this_usbduxsub->comedidev->minor);
for (result = 0; result < SIZEOFDUXBUFFER; result++)
printk(" %02x", this_usbduxsub->dux_commands[result]);
@@ -1112,7 +1112,7 @@ static int send_dux_commands(struct usbduxsub *this_usbduxsub, int cmd_type)
this_usbduxsub->dux_commands, SIZEOFDUXBUFFER,
&nsent, 10);
if (result < 0)
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
+ dev_err(&this_usbduxsub->interface->dev, "%d: "
"could not transmit dux_command to the usb-device, "
"err=%d\n", this_usbduxsub->comedidev->minor, result);
@@ -1132,7 +1132,7 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
this_usbduxsub->insnBuffer, SIZEINSNBUF,
&nrec, 1);
if (result < 0) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
+ dev_err(&this_usbduxsub->interface->dev, "%d: "
"insn: USB error %d while receiving DUX command"
"\n", this_usbduxsub->comedidev->minor, result);
return result;
@@ -1142,7 +1142,7 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
}
/* this is only reached if the data has been requested a couple of
* times */
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: insn: "
+ dev_err(&this_usbduxsub->interface->dev, "%d: insn: "
"wrong data returned from firmware: want cmd %d, got cmd %d.\n",
this_usbduxsub->comedidev->minor, command,
le16_to_cpu(this_usbduxsub->insnBuffer[0]));
@@ -1163,11 +1163,11 @@ static int usbdux_ai_inttrig(struct comedi_device *dev,
return -ENODEV;
}
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_inttrig\n", dev->minor);
+ "%d: usbdux_ai_inttrig\n", dev->minor);
if (trignum != 0) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_inttrig: invalid trignum\n",
+ "%d: usbdux_ai_inttrig: invalid trignum\n",
dev->minor);
up(&this_usbduxsub->sem);
return -EINVAL;
@@ -1177,7 +1177,7 @@ static int usbdux_ai_inttrig(struct comedi_device *dev,
ret = usbduxsub_submit_InURBs(this_usbduxsub);
if (ret < 0) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_inttrig: "
+ "%d: usbdux_ai_inttrig: "
"urbSubmit: err=%d\n", dev->minor, ret);
this_usbduxsub->ai_cmd_running = 0;
up(&this_usbduxsub->sem);
@@ -1186,7 +1186,7 @@ static int usbdux_ai_inttrig(struct comedi_device *dev,
s->async->inttrig = NULL;
} else {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ai_inttrig but acqu is already running\n",
+ "%d: ai_inttrig but acqu is already running\n",
dev->minor);
}
up(&this_usbduxsub->sem);
@@ -1205,7 +1205,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -EFAULT;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_cmd\n", dev->minor);
+ "%d: usbdux_ai_cmd\n", dev->minor);
/* block other CPUs from starting an ai_cmd */
down(&this_usbduxsub->sem);
@@ -1215,7 +1215,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -ENODEV;
}
if (this_usbduxsub->ai_cmd_running) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
+ dev_err(&this_usbduxsub->interface->dev, "%d: "
"ai_cmd not possible. Another ai_cmd is running.\n",
dev->minor);
up(&this_usbduxsub->sem);
@@ -1230,7 +1230,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
range = CR_RANGE(cmd->chanlist[i]);
if (i >= NUMCHANNELS) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: channel list too long\n",
+ "%d: channel list too long\n",
dev->minor);
break;
}
@@ -1269,7 +1269,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
this_usbduxsub->ai_timer = cmd->scan_begin_arg / 1000000;
}
if (this_usbduxsub->ai_timer < 1) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: ai_cmd: "
+ dev_err(&this_usbduxsub->interface->dev, "%d: ai_cmd: "
"timer=%d, scan_begin_arg=%d. "
"Not properly tested by cmdtest?\n", dev->minor,
this_usbduxsub->ai_timer, cmd->scan_begin_arg);
@@ -1324,7 +1324,7 @@ static int usbdux_ai_insn_read(struct comedi_device *dev,
return 0;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: ai_insn_read, insn->n=%d, insn->subdev=%d\n",
+ "%d: ai_insn_read, insn->n=%d, insn->subdev=%d\n",
dev->minor, insn->n, insn->subdev);
down(&this_usbduxsub->sem);
@@ -1334,7 +1334,7 @@ static int usbdux_ai_insn_read(struct comedi_device *dev,
}
if (this_usbduxsub->ai_cmd_running) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ai_insn_read not possible. "
+ "%d: ai_insn_read not possible. "
"Async Command is running.\n", dev->minor);
up(&this_usbduxsub->sem);
return 0;
@@ -1407,7 +1407,7 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
return -EFAULT;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: ao_insn_write\n", dev->minor);
+ "%d: ao_insn_write\n", dev->minor);
down(&this_usbduxsub->sem);
if (!(this_usbduxsub->probed)) {
@@ -1416,7 +1416,7 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
}
if (this_usbduxsub->ao_cmd_running) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ao_insn_write: "
+ "%d: ao_insn_write: "
"ERROR: asynchronous ao_cmd is running\n", dev->minor);
up(&this_usbduxsub->sem);
return 0;
@@ -1424,7 +1424,7 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) {
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: ao_insn_write: data[chan=%d,i=%d]=%d\n",
+ "%d: ao_insn_write: data[chan=%d,i=%d]=%d\n",
dev->minor, chan, i, data[i]);
/* number of channels: 1 */
@@ -1462,7 +1462,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
}
if (trignum != 0) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ao_inttrig: invalid trignum\n",
+ "%d: usbdux_ao_inttrig: invalid trignum\n",
dev->minor);
return -EINVAL;
}
@@ -1471,7 +1471,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
ret = usbduxsub_submit_OutURBs(this_usbduxsub);
if (ret < 0) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ao_inttrig: submitURB: "
+ "%d: usbdux_ao_inttrig: submitURB: "
"err=%d\n", dev->minor, ret);
this_usbduxsub->ao_cmd_running = 0;
up(&this_usbduxsub->sem);
@@ -1480,7 +1480,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
s->async->inttrig = NULL;
} else {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ao_inttrig but acqu is already running.\n",
+ "%d: ao_inttrig but acqu is already running.\n",
dev->minor);
}
up(&this_usbduxsub->sem);
@@ -1500,7 +1500,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
return -ENODEV;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ao_cmdtest\n", dev->minor);
+ "%d: usbdux_ao_cmdtest\n", dev->minor);
/* make sure triggers are valid */
/* Only immediate triggers are allowed */
@@ -1615,7 +1615,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
}
}
- dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: err=%d, "
+ dev_dbg(&this_usbduxsub->interface->dev, "%d: err=%d, "
"scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, "
"convert_arg=%d\n", dev->minor, err, cmd->scan_begin_src,
cmd->scan_begin_arg, cmd->convert_src, cmd->convert_arg);
@@ -1642,7 +1642,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -ENODEV;
}
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: %s\n", dev->minor, __func__);
+ "%d: %s\n", dev->minor, __func__);
/* set current channel of the running aquisition to zero */
s->async->cur_chan = 0;
@@ -1651,13 +1651,13 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
gain = CR_RANGE(cmd->chanlist[i]);
if (i >= NUMOUTCHANNELS) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: %s: channel list too long\n",
+ "%d: %s: channel list too long\n",
dev->minor, __func__);
break;
}
this_usbduxsub->dac_commands[i] = (chan << 6);
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: dac command for ch %d is %x\n",
+ "%d: dac command for ch %d is %x\n",
dev->minor, i, this_usbduxsub->dac_commands[i]);
}
@@ -1672,16 +1672,16 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* timing of the scan: we get all channels at once */
this_usbduxsub->ao_timer = cmd->scan_begin_arg / 1000000;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: scan_begin_src=%d, scan_begin_arg=%d, "
+ "%d: scan_begin_src=%d, scan_begin_arg=%d, "
"convert_src=%d, convert_arg=%d\n", dev->minor,
cmd->scan_begin_src, cmd->scan_begin_arg,
cmd->convert_src, cmd->convert_arg);
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: ao_timer=%d (ms)\n",
+ "%d: ao_timer=%d (ms)\n",
dev->minor, this_usbduxsub->ao_timer);
if (this_usbduxsub->ao_timer < 1) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux: ao_timer=%d, "
+ "%d: usbdux: ao_timer=%d, "
"scan_begin_arg=%d. "
"Not properly tested by cmdtest?\n",
dev->minor, this_usbduxsub->ao_timer,
@@ -2045,14 +2045,14 @@ static int usbdux_pwm_period(struct comedi_device *dev,
if (period < MIN_PWM_PERIOD) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: illegal period setting for pwm.\n",
+ "%d: illegal period setting for pwm.\n",
dev->minor);
return -EAGAIN;
} else {
fx2delay = period / ((int)(6 * 512 * (1.0 / 0.033))) - 6;
if (fx2delay > 255) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: period %d for pwm is too low.\n",
+ "%d: period %d for pwm is too low.\n",
dev->minor, period);
return -EAGAIN;
}
@@ -2071,7 +2071,7 @@ static int usbdux_pwm_start(struct comedi_device *dev,
int ret, i;
struct usbduxsub *this_usbduxsub = dev->private;
- dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: %s\n",
+ dev_dbg(&this_usbduxsub->interface->dev, "%d: %s\n",
dev->minor, __func__);
if (this_usbduxsub->pwm_cmd_running) {
@@ -2183,7 +2183,7 @@ static int usbdux_pwm_config(struct comedi_device *dev,
case INSN_CONFIG_ARM:
/* switch it on */
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: %s: pwm on\n", dev->minor, __func__);
+ "%d: %s: pwm on\n", dev->minor, __func__);
/*
* if not zero the PWM is limited to a certain time which is
* not supported here
@@ -2193,7 +2193,7 @@ static int usbdux_pwm_config(struct comedi_device *dev,
return usbdux_pwm_start(dev, s);
case INSN_CONFIG_DISARM:
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: %s: pwm off\n", dev->minor, __func__);
+ "%d: %s: pwm off\n", dev->minor, __func__);
return usbdux_pwm_cancel(dev, s);
case INSN_CONFIG_GET_PWM_STATUS:
/*
@@ -2204,7 +2204,7 @@ static int usbdux_pwm_config(struct comedi_device *dev,
return 0;
case INSN_CONFIG_PWM_SET_PERIOD:
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: %s: setting period\n", dev->minor, __func__);
+ "%d: %s: setting period\n", dev->minor, __func__);
return usbdux_pwm_period(dev, s, data[1]);
case INSN_CONFIG_PWM_GET_PERIOD:
data[1] = this_usbduxsub->pwmPeriod;
@@ -2640,8 +2640,7 @@ static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
if (index < 0) {
- printk(KERN_ERR "comedi%d: usbdux: error: attach failed, no "
- "usbdux devs connected to the usb bus.\n", dev->minor);
+ pr_err("%d: usbdux: error: attach failed, no usbdux devs connected to the usb bus.\n", dev->minor);
up(&start_stop_sem);
return -ENODEV;
}
@@ -2673,13 +2672,13 @@ static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ret = alloc_subdevices(dev, dev->n_subdevices);
if (ret < 0) {
dev_err(&udev->interface->dev,
- "comedi%d: error alloc space for subdev\n", dev->minor);
+ "%d: error alloc space for subdev\n", dev->minor);
up(&start_stop_sem);
return ret;
}
dev_info(&udev->interface->dev,
- "comedi%d: usb-device %d is attached to comedi.\n",
+ "%d: usb-device %d is attached to comedi.\n",
dev->minor, index);
/* private structure is also simply the usb-structure */
dev->private = udev;
@@ -2779,7 +2778,7 @@ static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it)
up(&start_stop_sem);
- dev_info(&udev->interface->dev, "comedi%d: attached to usbdux.\n",
+ dev_info(&udev->interface->dev, "%d: attached to usbdux.\n",
dev->minor);
return 0;
@@ -2790,19 +2789,17 @@ static int usbdux_detach(struct comedi_device *dev)
struct usbduxsub *usbduxsub_tmp;
if (!dev) {
- printk(KERN_ERR
- "comedi?: usbdux: detach without dev variable...\n");
+ pr_err("comedi?: usbdux: detach without dev variable...\n");
return -EFAULT;
}
usbduxsub_tmp = dev->private;
if (!usbduxsub_tmp) {
- printk(KERN_ERR
- "comedi?: usbdux: detach without ptr to usbduxsub[]\n");
+ pr_err("comedi?: usbdux: detach without ptr to usbduxsub[]\n");
return -EFAULT;
}
- dev_dbg(&usbduxsub_tmp->interface->dev, "comedi%d: detach usb device\n",
+ dev_dbg(&usbduxsub_tmp->interface->dev, "%d: detach usb device\n",
dev->minor);
down(&usbduxsub_tmp->sem);
@@ -2812,7 +2809,7 @@ static int usbdux_detach(struct comedi_device *dev)
usbduxsub_tmp->attached = 0;
usbduxsub_tmp->comedidev = NULL;
dev_dbg(&usbduxsub_tmp->interface->dev,
- "comedi%d: detach: successfully removed\n", dev->minor);
+ "%d: detach: successfully removed\n", dev->minor);
up(&usbduxsub_tmp->sem);
return 0;
}
@@ -2847,7 +2844,7 @@ static struct usb_driver usbduxsub_driver = {
/* registering the usb-system _and_ the comedi-driver */
static int __init init_usbdux(void)
{
- printk(KERN_INFO KBUILD_MODNAME ": "
+ pr_info(KBUILD_MODNAME ": "
DRIVER_VERSION ":" DRIVER_DESC "\n");
usb_register(&usbduxsub_driver);
comedi_driver_register(&driver_usbdux);
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index d143222..d37f437 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -215,7 +215,7 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type)
udfs->dux_commands[0] = cmd_type;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: dux_commands: ",
+ printk(KERN_DEBUG "%d: usbduxfast: dux_commands: ",
udfs->comedidev->minor);
for (tmp = 0; tmp < SIZEOFDUXBUFFER; tmp++)
printk(" %02x", udfs->dux_commands[tmp]);
@@ -226,8 +226,8 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type)
usb_sndbulkpipe(udfs->usbdev, CHANNELLISTEP),
udfs->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000);
if (tmp < 0)
- printk(KERN_ERR "comedi%d: could not transmit dux_commands to"
- "the usb-device, err=%d\n", udfs->comedidev->minor, tmp);
+ pr_err("%d: could not transmit dux_commands tothe usb-device, err=%d\n",
+ udfs->comedidev->minor, tmp);
return tmp;
}
@@ -262,11 +262,11 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink)
int ret = 0;
if (!udfs) {
- printk(KERN_ERR "comedi?: usbduxfast_ai_stop: udfs=NULL!\n");
+ pr_err("comedi?: %s: udfs=NULL!\n", __func__);
return -EFAULT;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast_ai_stop\n");
+ printk(KERN_DEBUG "comedi: %s\n", __func__);
#endif
udfs->ai_cmd_running = 0;
@@ -289,11 +289,11 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev,
/* force unlink of all urbs */
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast_ai_cancel\n");
+ printk(KERN_DEBUG "comedi: %s\n", __func__);
#endif
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi: usbduxfast_ai_cancel: udfs=NULL\n");
+ pr_err("comedi: %s: udfs=NULL\n", __func__);
return -EFAULT;
}
down(&udfs->sem);
@@ -322,22 +322,19 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
/* sanity checks - is the urb there? */
if (!urb) {
- printk(KERN_ERR "comedi_: usbduxfast_: ao int-handler called "
- "with urb=NULL!\n");
+ pr_err("comedi_: usbduxfast_: ao int-handler called with urb=NULL!\n");
return;
}
/* the context variable points to the subdevice */
this_comedidev = urb->context;
if (!this_comedidev) {
- printk(KERN_ERR "comedi_: usbduxfast_: urb context is a NULL "
- "pointer!\n");
+ pr_err("comedi_: usbduxfast_: urb context is a NULL pointer!\n");
return;
}
/* the private structure of the subdevice is usbduxfastsub_s */
udfs = this_comedidev->private;
if (!udfs) {
- printk(KERN_ERR "comedi_: usbduxfast_: private of comedi "
- "subdev is a NULL pointer!\n");
+ pr_err("comedi_: usbduxfast_: private of comedi subdev is a NULL pointer!\n");
return;
}
/* are we running a command? */
@@ -379,7 +376,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
return;
default:
- printk("comedi%d: usbduxfast: non-zero urb status received in "
+ printk("%d: usbduxfast: non-zero urb status received in "
"ai intr context: %d\n",
udfs->comedidev->minor, urb->status);
s->async->events |= COMEDI_CB_EOA;
@@ -436,7 +433,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
urb->status = 0;
err = usb_submit_urb(urb, GFP_ATOMIC);
if (err < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: urb resubm failed: %d",
+ pr_err("%d: usbduxfast: urb resubm failed: %d",
udfs->comedidev->minor, err);
s->async->events |= COMEDI_CB_EOA;
s->async->events |= COMEDI_CB_ERROR;
@@ -481,8 +478,7 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
local_transfer_buffer, 1, /* Length */
EZTIMEOUT); /* Timeout */
if (ret < 0) {
- printk(KERN_ERR "comedi_: usbduxfast: control msg failed "
- "(stop)\n");
+ pr_err("comedi_: usbduxfast: control msg failed (stop)\n");
return ret;
}
@@ -513,7 +509,7 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
#endif
if (ret < 0) {
- printk(KERN_ERR "comedi_: usbduxfast: uppload failed\n");
+ pr_err("comedi_: usbduxfast: uppload failed\n");
return ret;
}
@@ -533,14 +529,13 @@ int usbduxfastsub_submit_InURBs(struct usbduxfastsub_s *udfs)
SIZEINBUF, usbduxfastsub_ai_Irq, udfs->comedidev);
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: submitting in-urb: "
+ printk(KERN_DEBUG "%d: usbduxfast: submitting in-urb: "
"0x%p,0x%p\n", udfs->comedidev->minor, udfs->urbIn->context,
udfs->urbIn->dev);
#endif
ret = usb_submit_urb(udfs->urbIn, GFP_ATOMIC);
if (ret) {
- printk(KERN_ERR "comedi_: usbduxfast: ai: usb_submit_urb error"
- " %d\n", ret);
+ pr_err("comedi_: usbduxfast: ai: usb_submit_urb error %d\n", ret);
return ret;
}
return 0;
@@ -559,8 +554,8 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
return -ENODEV;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_cmdtest\n", dev->minor);
- printk(KERN_DEBUG "comedi%d: usbduxfast: convert_arg=%u "
+ printk(KERN_DEBUG "%d: %s\n", dev->minor, __func__);
+ printk(KERN_DEBUG "%d: usbduxfast: convert_arg=%u "
"scan_begin_arg=%u\n",
dev->minor, cmd->convert_arg, cmd->scan_begin_arg);
#endif
@@ -705,12 +700,11 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_inttrig\n", dev->minor);
+ printk(KERN_DEBUG "%d: usbduxfast_ai_inttrig\n", dev->minor);
#endif
if (trignum != 0) {
- printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: invalid"
- " trignum\n", dev->minor);
+ pr_err("%d: usbduxfast_ai_inttrig: invalid trignum\n", dev->minor);
up(&udfs->sem);
return -EINVAL;
}
@@ -718,16 +712,14 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
udfs->ai_cmd_running = 1;
ret = usbduxfastsub_submit_InURBs(udfs);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: "
- "urbSubmit: err=%d\n", dev->minor, ret);
+ pr_err("%d: usbduxfast_ai_inttrig: urbSubmit: err=%d\n", dev->minor, ret);
udfs->ai_cmd_running = 0;
up(&udfs->sem);
return ret;
}
s->async->inttrig = NULL;
} else {
- printk(KERN_ERR "comedi%d: ai_inttrig but acqu is already"
- " running\n", dev->minor);
+ pr_err("%d: ai_inttrig but acqu is already running\n", dev->minor);
}
up(&udfs->sem);
return 1;
@@ -753,7 +745,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
long steps, steps_tmp;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_cmd\n", dev->minor);
+ printk(KERN_DEBUG "%d: usbduxfast_ai_cmd\n", dev->minor);
#endif
udfs = dev->private;
if (!udfs)
@@ -765,8 +757,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
return -ENODEV;
}
if (udfs->ai_cmd_running) {
- printk(KERN_ERR "comedi%d: ai_cmd not possible. Another ai_cmd"
- " is running.\n", dev->minor);
+ pr_err("%d: ai_cmd not possible. Another ai_cmd is running.\n", dev->minor);
up(&udfs->sem);
return -EBUSY;
}
@@ -784,31 +775,27 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
for (i = 0; i < cmd->chanlist_len; ++i) {
chan = CR_CHAN(cmd->chanlist[i]);
if (chan != i) {
- printk(KERN_ERR "comedi%d: cmd is accepting "
- "only consecutive channels.\n",
+ pr_err("%d: cmd is accepting only consecutive channels.\n",
dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if ((gain != CR_RANGE(cmd->chanlist[i]))
&& (cmd->chanlist_len > 3)) {
- printk(KERN_ERR "comedi%d: the gain must be"
- " the same for all channels.\n",
+ pr_err("%d: the gain must be the same for all channels.\n",
dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if (i >= NUMCHANNELS) {
- printk(KERN_ERR "comedi%d: channel list too"
- " long\n", dev->minor);
+ pr_err("%d: channel list too long\n", dev->minor);
break;
}
}
}
steps = 0;
if (cmd->scan_begin_src == TRIG_TIMER) {
- printk(KERN_ERR "comedi%d: usbduxfast: "
- "scan_begin_src==TRIG_TIMER not valid.\n", dev->minor);
+ pr_err("%d: usbduxfast: scan_begin_src==TRIG_TIMER not valid.\n", dev->minor);
up(&udfs->sem);
return -EINVAL;
}
@@ -816,27 +803,24 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
steps = (cmd->convert_arg * 30) / 1000;
if ((steps < MIN_SAMPLING_PERIOD) && (cmd->chanlist_len != 1)) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: steps=%ld, "
- "scan_begin_arg=%d. Not properly tested by cmdtest?\n",
+ pr_err("%d: usbduxfast: ai_cmd: steps=%ld, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
dev->minor, steps, cmd->scan_begin_arg);
up(&udfs->sem);
return -EINVAL;
}
if (steps > MAX_SAMPLING_PERIOD) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: sampling rate "
- "too low.\n", dev->minor);
+ pr_err("%d: usbduxfast: ai_cmd: sampling rate too low.\n", dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if ((cmd->start_src == TRIG_EXT) && (cmd->chanlist_len != 1)
&& (cmd->chanlist_len != 16)) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: TRIG_EXT only"
- " with 1 or 16 channels possible.\n", dev->minor);
+ pr_err("%d: usbduxfast: ai_cmd: TRIG_EXT only with 1 or 16 channels possible.\n", dev->minor);
up(&udfs->sem);
return -EINVAL;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: steps=%ld, convert_arg=%u\n",
+ printk(KERN_DEBUG "%d: usbduxfast: steps=%ld, convert_arg=%u\n",
dev->minor, steps, cmd->convert_arg);
#endif
@@ -1148,8 +1132,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
break;
default:
- printk(KERN_ERR "comedi %d: unsupported combination of "
- "channels\n", dev->minor);
+ pr_err("comedi %d: unsupported combination of channels\n", dev->minor);
up(&udfs->sem);
return -EFAULT;
}
@@ -1161,17 +1144,14 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
/* 0 means that the AD commands are sent */
result = send_dux_commands(udfs, SENDADCOMMANDS);
if (result < 0) {
- printk(KERN_ERR "comedi%d: adc command could not be submitted."
- "Aborting...\n", dev->minor);
+ pr_err("%d: adc command could not be submitted.Aborting...\n", dev->minor);
up(&udfs->sem);
return result;
}
if (cmd->stop_src == TRIG_COUNT) {
udfs->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg;
if (udfs->ai_sample_count < 1) {
- printk(KERN_ERR "comedi%d: "
- "(cmd->stop_arg)*(cmd->scan_end_arg)<1, "
- "aborting.\n", dev->minor);
+ pr_err("%d: (cmd->stop_arg)*(cmd->scan_end_arg)<1, aborting.\n", dev->minor);
up(&udfs->sem);
return -EFAULT;
}
@@ -1220,12 +1200,12 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi%d: ai_insn_read: no usb dev.\n",
+ pr_err("%d: ai_insn_read: no usb dev.\n",
dev->minor);
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: ai_insn_read, insn->n=%d, "
+ printk(KERN_DEBUG "%d: ai_insn_read, insn->n=%d, "
"insn->subdev=%d\n", dev->minor, insn->n, insn->subdev);
#endif
down(&udfs->sem);
@@ -1234,8 +1214,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
return -ENODEV;
}
if (udfs->ai_cmd_running) {
- printk(KERN_ERR "comedi%d: ai_insn_read not possible. Async "
- "Command is running.\n", dev->minor);
+ pr_err("%d: ai_insn_read not possible. Async Command is running.\n", dev->minor);
up(&udfs->sem);
return -EBUSY;
}
@@ -1295,13 +1274,12 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
/* 0 means that the AD commands are sent */
err = send_dux_commands(udfs, SENDADCOMMANDS);
if (err < 0) {
- printk(KERN_ERR "comedi%d: adc command could not be submitted."
- "Aborting...\n", dev->minor);
+ pr_err("%d: adc command could not be submitted.Aborting...\n", dev->minor);
up(&udfs->sem);
return err;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: submitting in-urb: "
+ printk(KERN_DEBUG "%d: usbduxfast: submitting in-urb: "
"0x%p,0x%p\n", udfs->comedidev->minor, udfs->urbIn->context,
udfs->urbIn->dev);
#endif
@@ -1311,7 +1289,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000);
if (err < 0) {
- printk(KERN_ERR "comedi%d: insn timeout. No data.\n",
+ pr_err("%d: insn timeout. No data.\n",
dev->minor);
up(&udfs->sem);
return err;
@@ -1324,15 +1302,14 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000);
if (err < 0) {
- printk(KERN_ERR "comedi%d: insn data error: %d\n",
+ pr_err("%d: insn data error: %d\n",
dev->minor, err);
up(&udfs->sem);
return err;
}
n = actual_length / sizeof(uint16_t);
if ((n % 16) != 0) {
- printk(KERN_ERR "comedi%d: insn data packet "
- "corrupted.\n", dev->minor);
+ pr_err("%d: insn data packet corrupted.\n", dev->minor);
up(&udfs->sem);
return -EINVAL;
}
@@ -1469,8 +1446,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
int ret;
if (udev->speed != USB_SPEED_HIGH) {
- printk(KERN_ERR "comedi_: usbduxfast_: This driver needs"
- "USB 2.0 to operate. Aborting...\n");
+ pr_err("comedi_: usbduxfast_: This driver needsUSB 2.0 to operate. Aborting...\n");
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
@@ -1489,7 +1465,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
/* no more space */
if (index == -1) {
- printk(KERN_ERR "Too many usbduxfast-devices connected.\n");
+ pr_err("Too many usbduxfast-devices connected.\n");
up(&start_stop_sem);
return -EMFILE;
}
@@ -1520,8 +1496,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
usbduxfastsub[index].dux_commands = kmalloc(SIZEOFDUXBUFFER,
GFP_KERNEL);
if (!usbduxfastsub[index].dux_commands) {
- printk(KERN_ERR "comedi_: usbduxfast: error alloc space for "
- "dac commands\n");
+ pr_err("comedi_: usbduxfast: error alloc space for dac commands\n");
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1529,8 +1504,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
/* create space of the instruction buffer */
usbduxfastsub[index].insnBuffer = kmalloc(SIZEINSNBUF, GFP_KERNEL);
if (!usbduxfastsub[index].insnBuffer) {
- printk(KERN_ERR "comedi_: usbduxfast: could not alloc space "
- "for insnBuffer\n");
+ pr_err("comedi_: usbduxfast: could not alloc space for insnBuffer\n");
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1539,24 +1513,21 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
i = usb_set_interface(usbduxfastsub[index].usbdev,
usbduxfastsub[index].ifnum, 1);
if (i < 0) {
- printk(KERN_ERR "comedi_: usbduxfast%d: could not switch to "
- "alternate setting 1.\n", index);
+ pr_err("comedi_: usbduxfast%d: could not switch to alternate setting 1.\n", index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENODEV;
}
usbduxfastsub[index].urbIn = usb_alloc_urb(0, GFP_KERNEL);
if (!usbduxfastsub[index].urbIn) {
- printk(KERN_ERR "comedi_: usbduxfast%d: Could not alloc."
- "urb\n", index);
+ pr_err("comedi_: usbduxfast%d: Could not alloc.urb\n", index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
}
usbduxfastsub[index].transfer_buffer = kmalloc(SIZEINBUF, GFP_KERNEL);
if (!usbduxfastsub[index].transfer_buffer) {
- printk(KERN_ERR "comedi_: usbduxfast%d: could not alloc. "
- "transb.\n", index);
+ pr_err("comedi_: usbduxfast%d: could not alloc. transb.\n", index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1577,8 +1548,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
return ret;
}
- printk(KERN_INFO "comedi_: usbduxfast%d has been successfully "
- "initialized.\n", index);
+ pr_info("comedi_: usbduxfast%d has been successfully initialized.\n", index);
/* success */
return 0;
}
@@ -1589,13 +1559,11 @@ static void usbduxfastsub_disconnect(struct usb_interface *intf)
struct usb_device *udev = interface_to_usbdev(intf);
if (!udfs) {
- printk(KERN_ERR "comedi_: usbduxfast: disconnect called with "
- "null pointer.\n");
+ pr_err("comedi_: usbduxfast: disconnect called with null pointer.\n");
return;
}
if (udfs->usbdev != udev) {
- printk(KERN_ERR "comedi_: usbduxfast: BUG! called with wrong "
- "ptr!!!\n");
+ pr_err("comedi_: usbduxfast: BUG! called with wrong ptr!!!\n");
return;
}
@@ -1638,8 +1606,7 @@ static int usbduxfast_attach(struct comedi_device *dev,
}
if (index < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: error: attach failed, "
- "no usbduxfast devs connected to the usb bus.\n",
+ pr_err("%d: usbduxfast: error: attach failed, no usbduxfast devs connected to the usb bus.\n",
dev->minor);
up(&start_stop_sem);
return -ENODEV;
@@ -1665,15 +1632,13 @@ static int usbduxfast_attach(struct comedi_device *dev,
/* allocate space for the subdevices */
ret = alloc_subdevices(dev, N_SUBDEVICES);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: error alloc space for "
- "subdev\n", dev->minor);
+ pr_err("%d: usbduxfast: error alloc space for subdev\n", dev->minor);
up(&(usbduxfastsub[index].sem));
up(&start_stop_sem);
return ret;
}
- printk(KERN_INFO "comedi%d: usbduxfast: usb-device %d is attached to "
- "comedi.\n", dev->minor, index);
+ pr_info("%d: usbduxfast: usb-device %d is attached to comedi.\n", dev->minor, index);
/* private structure is also simply the usb-structure */
dev->private = usbduxfastsub + index;
/* the first subdevice is the A/D converter */
@@ -1708,7 +1673,7 @@ static int usbduxfast_attach(struct comedi_device *dev,
up(&(usbduxfastsub[index].sem));
up(&start_stop_sem);
- printk(KERN_INFO "comedi%d: successfully attached to usbduxfast.\n",
+ pr_info("%d: successfully attached to usbduxfast.\n",
dev->minor);
return 0;
@@ -1719,19 +1684,17 @@ static int usbduxfast_detach(struct comedi_device *dev)
struct usbduxfastsub_s *udfs;
if (!dev) {
- printk(KERN_ERR "comedi?: usbduxfast: detach without dev "
- "variable...\n");
+ pr_err("comedi?: usbduxfast: detach without dev variable...\n");
return -EFAULT;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: detach usb device\n",
+ printk(KERN_DEBUG "%d: usbduxfast: detach usb device\n",
dev->minor);
#endif
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi?: usbduxfast: detach without ptr to "
- "usbduxfastsub[]\n");
+ pr_err("comedi?: usbduxfast: detach without ptr to usbduxfastsub[]\n");
return -EFAULT;
}
@@ -1745,7 +1708,7 @@ static int usbduxfast_detach(struct comedi_device *dev)
udfs->attached = 0;
udfs->comedidev = NULL;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: detach: successfully "
+ printk(KERN_DEBUG "%d: usbduxfast: detach: successfully "
"removed\n", dev->minor);
#endif
up(&start_stop_sem);
@@ -1794,8 +1757,7 @@ static struct usb_driver usbduxfastsub_driver = {
*/
static int __init init_usbduxfast(void)
{
- printk(KERN_INFO
- KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n");
+ pr_info(KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n");
usb_register(&usbduxfastsub_driver);
comedi_driver_register(&driver_usbduxfast);
return 0;
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index c335040..cd0fc51 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1139,8 +1139,7 @@ vmk80xx_attach(struct comedi_device *cdev, struct comedi_devconfig *it)
minor = cdev->minor;
- printk(KERN_INFO
- "comedi%d: vmk80xx: board #%d [%s] attached to comedi\n",
+ pr_info("%d: vmk80xx: board #%d [%s] attached to comedi\n",
minor, dev->count, dev->board.name);
up(&dev->limit_sem);
@@ -1170,8 +1169,7 @@ static int vmk80xx_detach(struct comedi_device *cdev)
minor = cdev->minor;
- printk(KERN_INFO
- "comedi%d: vmk80xx: board #%d [%s] detached from comedi\n",
+ pr_info("%d: vmk80xx: board #%d [%s] detached from comedi\n",
minor, dev->count, dev->board.name);
up(&dev->limit_sem);
@@ -1303,11 +1301,11 @@ vmk80xx_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (dev->board.model == VMK8061_MODEL) {
vmk80xx_read_eeprom(dev, IC3_VERSION);
- printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+ pr_info("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",
+ pr_info("comedi#: vmk80xx: %s\n",
dev->fw.ic6_vers);
} else
dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
@@ -1318,7 +1316,7 @@ vmk80xx_probe(struct usb_interface *intf, const struct usb_device_id *id)
dev->probed = 1;
- printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
+ pr_info("comedi#: vmk80xx: board #%d [%s] now attached\n",
dev->count, dev->board.name);
mutex_unlock(&glb_mutex);
@@ -1351,7 +1349,7 @@ static void vmk80xx_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",
+ pr_info("comedi#: vmk80xx: board #%d [%s] now detached\n",
dev->count, dev->board.name);
up(&dev->limit_sem);
@@ -1376,8 +1374,7 @@ static struct comedi_driver driver_vmk80xx = {
static int __init vmk80xx_init(void)
{
- printk(KERN_INFO "vmk80xx: version 0.8.01 "
- "Manuel Gebele <forensixs@xxxxxx>\n");
+ pr_info("vmk80xx: version 0.8.01 Manuel Gebele <forensixs@xxxxxx>\n");
usb_register(&vmk80xx_driver);
return comedi_driver_register(&driver_vmk80xx);
}
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
