staging: comedi: adl_pci9111: the irq is only needed for async command support

An irq is only needed for async command support, modify the attach of
the subdevices so that the command support is only hooked up if the irq
request was successful. Remove the then unnecessary sanity check in
pci9111_ai_do_cmd().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 8dd39739b46216468618a7ce37583e25ff4aec86..de763ec4ce21828a4c237b6b67fa48d620bb2660 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -470,11 +470,6 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev,
        struct pci9111_private_data *dev_private = dev->private;
        struct comedi_cmd *async_cmd = &s->async->cmd;
 
-       if (!dev->irq) {
-               comedi_error(dev,
-                            "no irq assigned for PCI9111, cannot do hardware conversion");
-               return -1;
-       }
        /*  Set channel scan limit */
        /*  PCI9111 allows only scanning from channel 0 to channel n */
        /*  TODO: handle the case of an external multiplexer */
@@ -858,12 +853,11 @@ static int pci9111_auto_attach(struct comedi_device *dev,
 
        pci9111_reset(dev);
 
-       if (pcidev->irq > 0) {
+       if (pcidev->irq) {
                ret = request_irq(pcidev->irq, pci9111_interrupt,
                                  IRQF_SHARED, dev->board_name, dev);
-               if (ret)
-                       return ret;
-               dev->irq = pcidev->irq;
+               if (ret == 0)
+                       dev->irq = pcidev->irq;
        }
 
        ret = comedi_alloc_subdevices(dev, 4);
@@ -871,18 +865,21 @@ static int pci9111_auto_attach(struct comedi_device *dev,
                return ret;
 
        s = &dev->subdevices[0];
-       dev->read_subdev = s;
        s->type         = COMEDI_SUBD_AI;
-       s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ;
+       s->subdev_flags = SDF_READABLE | SDF_COMMON;
        s->n_chan       = 16;
        s->maxdata      = 0xffff;
-       s->len_chanlist = 16;
        s->range_table  = &pci9111_ai_range;
-       s->cancel       = pci9111_ai_cancel;
        s->insn_read    = pci9111_ai_insn_read;
-       s->do_cmdtest   = pci9111_ai_do_cmd_test;
-       s->do_cmd       = pci9111_ai_do_cmd;
-       s->munge        = pci9111_ai_munge;
+       if (dev->irq) {
+               dev->read_subdev = s;
+               s->subdev_flags |= SDF_CMD_READ;
+               s->len_chanlist = s->n_chan;
+               s->do_cmdtest   = pci9111_ai_do_cmd_test;
+               s->do_cmd       = pci9111_ai_do_cmd;
+               s->cancel       = pci9111_ai_cancel;
+               s->munge        = pci9111_ai_munge;
+       }
 
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_AO;