From fb62d5df19ac3b2252bad04fbca925d0b7828e86 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jan 2013 15:19:32 -0700 Subject: [PATCH] --- yaml --- r: 354124 b: refs/heads/master c: 20f2e2e1ceee6575794e9957912399d7ead8458f h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_2200.c | 33 +++++-------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 688d98b25232..7ef624b52a47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5872471364f0a49f95a8efbec80c622a24c7df6b +refs/heads/master: 20f2e2e1ceee6575794e9957912399d7ead8458f diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c index 2e527b03df74..b8a8a3fc9375 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c @@ -84,7 +84,7 @@ static int apci2200_auto_attach(struct comedi_device *dev, { struct pci_dev *pcidev = comedi_to_pci_dev(dev); struct comedi_subdevice *s; - int ret, n_subdevices; + int ret; dev->board_name = dev->driver->driver_name; @@ -94,21 +94,12 @@ static int apci2200_auto_attach(struct comedi_device *dev, dev->iobase = pci_resource_start(pcidev, 1); - n_subdevices = 7; - ret = comedi_alloc_subdevices(dev, n_subdevices); + ret = comedi_alloc_subdevices(dev, 3); if (ret) return ret; - /* Allocate and Initialise AI Subdevice Structures */ + /* Initialize the digital input subdevice */ s = &dev->subdevices[0]; - s->type = COMEDI_SUBD_UNUSED; - - /* Allocate and Initialise AO Subdevice Structures */ - s = &dev->subdevices[1]; - s->type = COMEDI_SUBD_UNUSED; - - /* Allocate and Initialise DI Subdevice Structures */ - s = &dev->subdevices[2]; s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE; s->n_chan = 8; @@ -116,8 +107,8 @@ static int apci2200_auto_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = apci2200_di_insn_bits; - /* Allocate and Initialise DO Subdevice Structures */ - s = &dev->subdevices[3]; + /* Initialize the digital output subdevice */ + s = &dev->subdevices[1]; s->type = COMEDI_SUBD_DO; s->subdev_flags = SDF_WRITEABLE; s->n_chan = 16; @@ -125,20 +116,12 @@ static int apci2200_auto_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = apci2200_do_insn_bits; - /* Allocate and Initialise Timer Subdevice Structures */ - s = &dev->subdevices[4]; + /* Initialize the watchdog subdevice */ + s = &dev->subdevices[2]; ret = addi_watchdog_init(s, dev->iobase + APCI2200_WDOG_REG); if (ret) return ret; - /* Allocate and Initialise TTL */ - s = &dev->subdevices[5]; - s->type = COMEDI_SUBD_UNUSED; - - /* EEPROM */ - s = &dev->subdevices[6]; - s->type = COMEDI_SUBD_UNUSED; - apci2200_reset(dev); return 0; } @@ -150,7 +133,7 @@ static void apci2200_detach(struct comedi_device *dev) if (dev->iobase) apci2200_reset(dev); if (dev->subdevices) - addi_watchdog_cleanup(&dev->subdevices[4]); + addi_watchdog_cleanup(&dev->subdevices[2]); if (pcidev) { if (dev->iobase) comedi_pci_disable(pcidev);