Skip to content

Commit

Permalink
staging: comedi: addi-data: remove 'b_ValidDriver' from the private data
Browse files Browse the repository at this point in the history
This variable is only used in the detach of the addi-data boards to
indicate that the attach of the board was successful and that the reset
function can be called. We can use the dev->iobase variable to indicate
this instead. Once this variable is set the attach always completes.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 3424819 commit ae0e3b8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ static int addi_attach_pci(struct comedi_device *dev,
}

i_ADDI_Reset(dev);
devpriv->b_ValidDriver = 1;
return 0;
}

Expand All @@ -378,7 +377,7 @@ static void i_ADDI_Detach(struct comedi_device *dev)
struct addi_private *devpriv = dev->private;

if (devpriv) {
if (devpriv->b_ValidDriver)
if (dev->iobase)
i_ADDI_Reset(dev);
if (dev->irq)
free_irq(dev->irq, dev);
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/addi-data/addi_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ struct addi_private {
int i_IobaseAddon; /* addon base address */
int i_IobaseReserved;
void __iomem *dw_AiBase;
unsigned char b_ValidDriver; /* driver is ok */
unsigned char b_AiContinuous; /* we do unlimited AI */
unsigned char b_AiInitialisation;
unsigned int ui_AiActualScan; /* how many scans we finished */
Expand Down

0 comments on commit ae0e3b8

Please sign in to comment.