diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-18 18:59:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 16:51:37 -0700 |
| commit | 6bdae560f46cddc8aeff5bd9c76454168ee8e8ab (patch) | |
| tree | 682dded179da9171ea847783eb8e63c6d7f389c9 /drivers | |
| parent | 5d30e51909b61916744e45d3c50cf42569c92c20 (diff) | |
| download | linux-3.10-6bdae560f46cddc8aeff5bd9c76454168ee8e8ab.tar.gz linux-3.10-6bdae560f46cddc8aeff5bd9c76454168ee8e8ab.tar.bz2 linux-3.10-6bdae560f46cddc8aeff5bd9c76454168ee8e8ab.zip | |
staging: comedi: dyna_pci10xx: remove the 'start_stop_sem' mutex
The comedi core already has a mutex protecting the attach/detach
of the comedi drivers.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/dyna_pci10xx.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c index bd804f10dbc..82002c4ff13 100644 --- a/drivers/staging/comedi/drivers/dyna_pci10xx.c +++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c @@ -45,8 +45,6 @@ #define READ_TIMEOUT 50 -static DEFINE_MUTEX(start_stop_sem); - static const struct comedi_lrange range_pci1050_ai = { 3, { BIP_RANGE(10), BIP_RANGE(5), @@ -267,20 +265,15 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, struct comedi_subdevice *s; int ret; - mutex_lock(&start_stop_sem); - if (alloc_private(dev, sizeof(struct dyna_pci10xx_private)) < 0) { printk(KERN_ERR "comedi: dyna_pci10xx: " "failed to allocate memory!\n"); - mutex_unlock(&start_stop_sem); return -ENOMEM; } pcidev = dyna_pci10xx_find_pci_dev(dev, it); - if (!pcidev) { - mutex_unlock(&start_stop_sem); + if (!pcidev) return -EIO; - } devpriv->pci_dev = pcidev; dev->board_name = thisboard->name; @@ -289,7 +282,6 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, if (comedi_pci_enable(pcidev, DRV_NAME)) { printk(KERN_ERR "comedi: dyna_pci10xx: " "failed to enable PCI device and request regions!"); - mutex_unlock(&start_stop_sem); return -EIO; } @@ -306,10 +298,8 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, devpriv->BADR5 = pci_resource_start(pcidev, 5); ret = comedi_alloc_subdevices(dev, 4); - if (ret) { - mutex_unlock(&start_stop_sem); + if (ret) return ret; - } /* analog input */ s = dev->subdevices + 0; @@ -353,7 +343,6 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, s->insn_bits = dyna_pci10xx_do_insn_bits; devpriv->valid = 1; - mutex_unlock(&start_stop_sem); printk(KERN_INFO "comedi: dyna_pci10xx: %s - device setup completed!\n", thisboard->name); |