|
@@ -773,14 +773,12 @@ 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);
|
|
|
-
|
|
|
opt_bus = it->options[0];
|
|
|
opt_slot = it->options[1];
|
|
|
|
|
|
if (sizeof(struct jr3_channel) != 0xc00) {
|
|
|
- printk("sizeof(struct jr3_channel) = %x [expected %x]\n",
|
|
|
- (unsigned)sizeof(struct jr3_channel), 0xc00);
|
|
|
+ dev_err(dev->hw_dev, "sizeof(struct jr3_channel) = %x [expected %x]\n",
|
|
|
+ (unsigned)sizeof(struct jr3_channel), 0xc00);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
@@ -834,7 +832,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
|
|
|
}
|
|
|
}
|
|
|
if (!card) {
|
|
|
- printk(" no jr3_pci found\n");
|
|
|
+ dev_err(dev->hw_dev, "no jr3_pci found\n");
|
|
|
return -EIO;
|
|
|
} else {
|
|
|
devpriv->pci_dev = card;
|
|
@@ -869,10 +867,10 @@ static int jr3_pci_attach(struct comedi_device *dev,
|
|
|
|
|
|
p = dev->subdevices[i].private;
|
|
|
p->channel = &devpriv->iobase->channel[i].data;
|
|
|
- printk("p->channel %p %p (%tx)\n",
|
|
|
- p->channel, devpriv->iobase,
|
|
|
- ((char *)(p->channel) -
|
|
|
- (char *)(devpriv->iobase)));
|
|
|
+ dev_dbg(dev->hw_dev, "p->channel %p %p (%tx)\n",
|
|
|
+ p->channel, devpriv->iobase,
|
|
|
+ ((char *)(p->channel) -
|
|
|
+ (char *)(devpriv->iobase)));
|
|
|
p->channel_no = i;
|
|
|
for (j = 0; j < 8; j++) {
|
|
|
int k;
|
|
@@ -910,7 +908,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
|
|
|
devpriv->iobase->channel[0].reset = 0;
|
|
|
|
|
|
result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
|
|
|
- printk("Firmare load %d\n", result);
|
|
|
+ dev_dbg(dev->hw_dev, "Firmare load %d\n", result);
|
|
|
|
|
|
if (result < 0)
|
|
|
goto out;
|
|
@@ -928,9 +926,9 @@ static int jr3_pci_attach(struct comedi_device *dev,
|
|
|
*/
|
|
|
msleep_interruptible(25);
|
|
|
for (i = 0; i < 0x18; i++) {
|
|
|
- printk("%c",
|
|
|
- get_u16(&devpriv->iobase->channel[0].
|
|
|
- data.copyright[i]) >> 8);
|
|
|
+ dev_dbg(dev->hw_dev, "%c\n",
|
|
|
+ get_u16(&devpriv->iobase->channel[0].
|
|
|
+ data.copyright[i]) >> 8);
|
|
|
}
|
|
|
|
|
|
/* Start card timer */
|
|
@@ -957,7 +955,6 @@ 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);
|
|
|
if (devpriv) {
|
|
|
del_timer_sync(&devpriv->timer);
|
|
|
|