Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[cascardo/linux.git] / drivers / staging / comedi / drivers / cb_pcidas.c

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 7377da1..4a7bd4e 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -461,7 +461,6 @@ static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                break;
        default:
                return -EINVAL;
-               break;
        }
        return insn->n;
 }
@@ -622,7 +621,7 @@ static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
        static const int caldac_8800_udelay = 1;
 
        if (address >= num_caldac_channels) {
-               comedi_error(dev, "illegal caldac channel");
+               dev_err(dev->class_dev, "illegal caldac channel\n");
                return -1;
        }
 
@@ -774,9 +773,8 @@ static int cb_pcidas_trimpot_write(struct comedi_device *dev,
                trimpot_8402_write(dev, channel, value);
                break;
        default:
-               comedi_error(dev, "driver bug?");
+               dev_err(dev->class_dev, "driver bug?\n");
                return -1;
-               break;
        }
 
        return 1;
@@ -1251,9 +1249,8 @@ static int cb_pcidas_ao_cmd(struct comedi_device *dev,
                break;
        default:
                spin_unlock_irqrestore(&dev->spinlock, flags);
-               comedi_error(dev, "error setting dac pacer source");
+               dev_err(dev->class_dev, "error setting dac pacer source\n");
                return -1;
-               break;
        }
        spin_unlock_irqrestore(&dev->spinlock, flags);
 
@@ -1303,7 +1300,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
                        if (cmd->stop_src == TRIG_NONE ||
                            (cmd->stop_src == TRIG_COUNT
                             && devpriv->ao_count)) {
-                               comedi_error(dev, "dac fifo underflow");
+                               dev_err(dev->class_dev, "dac fifo underflow\n");
                                async->events |= COMEDI_CB_ERROR;
                        }
                        async->events |= COMEDI_CB_EOA;
@@ -1414,8 +1411,8 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
                     devpriv->control_status + INT_ADCFIFO);
                spin_unlock_irqrestore(&dev->spinlock, flags);
        } else if (status & EOAI) {
-               comedi_error(dev,
-                            "bug! encountered end of acquisition interrupt?");
+               dev_err(dev->class_dev,
+                       "bug! encountered end of acquisition interrupt?\n");
                /*  clear EOA interrupt latch */
                spin_lock_irqsave(&dev->spinlock, flags);
                outw(devpriv->adc_fifo_bits | EOAI,
@@ -1424,7 +1421,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
        }
        /* check for fifo overflow */
        if (status & LADFUL) {
-               comedi_error(dev, "fifo overflow");
+               dev_err(dev->class_dev, "fifo overflow\n");
                /*  clear overflow interrupt latch */
                spin_lock_irqsave(&dev->spinlock, flags);
                outw(devpriv->adc_fifo_bits | LADFUL,
@@ -1474,11 +1471,12 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
        outl(INTCSR_INBOX_INTR_STATUS,
             devpriv->s5933_config + AMCC_OP_REG_INTCSR);
 
-       if (request_irq(pcidev->irq, cb_pcidas_interrupt,
-                       IRQF_SHARED, dev->driver->driver_name, dev)) {
+       ret = request_irq(pcidev->irq, cb_pcidas_interrupt, IRQF_SHARED,
+                         dev->board_name, dev);
+       if (ret) {
                dev_dbg(dev->class_dev, "unable to allocate irq %d\n",
                        pcidev->irq);
-               return -EINVAL;
+               return ret;
        }
        dev->irq = pcidev->irq;