From cfb5fa0e53a29163275ab2c15d4c30022f0f664b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 16 Aug 2012 19:50:01 -0700 Subject: [PATCH] --- yaml --- r: 324588 b: refs/heads/master c: ce774eab13606610df53301897e9c003476d7c6c h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/cb_pcimdda.c | 31 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 42c2405a298b..a3bc32817f2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b00a2f801866bd89a70f082cd0f322c7019d476 +refs/heads/master: ce774eab13606610df53301897e9c003476d7c6c diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c index 4127aa756f6a..b4d1f8b6136f 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -137,7 +137,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = { * struct. */ struct cb_pcimdda_private { - unsigned long dio_registers; char attached_to_8255; /* boolean */ #define MAX_AO_READBACK_CHANNELS 6 @@ -243,11 +242,11 @@ static int cb_pcimdda_attach(struct comedi_device *dev, struct cb_pcimdda_private *devpriv; struct pci_dev *pcidev; struct comedi_subdevice *s; - int err; + int ret; - err = alloc_private(dev, sizeof(*devpriv)); - if (err) - return err; + ret = alloc_private(dev, sizeof(*devpriv)); + if (ret) + return ret; devpriv = dev->private; pcidev = cb_pcimdda_probe(dev, it); @@ -257,15 +256,14 @@ static int cb_pcimdda_attach(struct comedi_device *dev, thisboard = comedi_board(dev); dev->board_name = thisboard->name; - err = comedi_pci_enable(pcidev, dev->board_name); - if (err) - return err; + ret = comedi_pci_enable(pcidev, dev->board_name); + if (ret) + return ret; dev->iobase = pci_resource_start(pcidev, thisboard->regs_badrindex); - devpriv->dio_registers = dev->iobase + thisboard->dio_offset; - err = comedi_alloc_subdevices(dev, 2); - if (err) - return err; + ret = comedi_alloc_subdevices(dev, 2); + if (ret) + return ret; s = dev->subdevices + 0; @@ -287,11 +285,10 @@ static int cb_pcimdda_attach(struct comedi_device *dev, if (thisboard->dio_chans) { switch (thisboard->dio_method) { case DIO_8255: - /* - * this is a straight 8255, so register us with - * the 8255 driver - */ - subdev_8255_init(dev, s, NULL, devpriv->dio_registers); + ret = subdev_8255_init(dev, s, NULL, + dev->iobase + thisboard->dio_offset); + if (ret) + return ret; devpriv->attached_to_8255 = 1; break; case DIO_INTERNAL: