diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-21 17:17:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 19:03:02 -0500 |
commit | 3f8e9e67cb8c0f99b3cb7936d650ad16adedbc34 (patch) | |
tree | fde8830765d063479ac1d8894cd9937fafcd8529 /drivers | |
parent | 934efe63e8bece28c69d18ea5e3bfd1619fc23b2 (diff) |
staging: comedi: addi_apci_2200: remove devpriv allocation
The 'devpriv' is not used in this driver. Remove it's allocation
in the auto_attach and the check for it in the detach.
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/addi_apci_2200.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c index 99a206aa5ab4..7ea0dc673b5c 100644 --- a/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/drivers/staging/comedi/drivers/addi_apci_2200.c | |||
@@ -81,7 +81,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, | |||
81 | { | 81 | { |
82 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 82 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
83 | const struct addi_board *this_board; | 83 | const struct addi_board *this_board; |
84 | struct addi_private *devpriv; | ||
85 | struct comedi_subdevice *s; | 84 | struct comedi_subdevice *s; |
86 | int ret, n_subdevices; | 85 | int ret, n_subdevices; |
87 | 86 | ||
@@ -91,11 +90,6 @@ static int apci2200_auto_attach(struct comedi_device *dev, | |||
91 | dev->board_ptr = this_board; | 90 | dev->board_ptr = this_board; |
92 | dev->board_name = this_board->pc_DriverName; | 91 | dev->board_name = this_board->pc_DriverName; |
93 | 92 | ||
94 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | ||
95 | if (!devpriv) | ||
96 | return -ENOMEM; | ||
97 | dev->private = devpriv; | ||
98 | |||
99 | ret = comedi_pci_enable(pcidev, dev->board_name); | 93 | ret = comedi_pci_enable(pcidev, dev->board_name); |
100 | if (ret) | 94 | if (ret) |
101 | return ret; | 95 | return ret; |
@@ -154,12 +148,9 @@ static int apci2200_auto_attach(struct comedi_device *dev, | |||
154 | static void apci2200_detach(struct comedi_device *dev) | 148 | static void apci2200_detach(struct comedi_device *dev) |
155 | { | 149 | { |
156 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 150 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
157 | struct addi_private *devpriv = dev->private; | ||
158 | 151 | ||
159 | if (devpriv) { | 152 | if (dev->iobase) |
160 | if (dev->iobase) | 153 | apci2200_reset(dev); |
161 | apci2200_reset(dev); | ||
162 | } | ||
163 | if (dev->subdevices) | 154 | if (dev->subdevices) |
164 | addi_watchdog_cleanup(&dev->subdevices[4]); | 155 | addi_watchdog_cleanup(&dev->subdevices[4]); |
165 | if (pcidev) { | 156 | if (pcidev) { |