staging: comedi: addi-data: remove i_pci_card_free()

This function calls comedi_pci_disable() to disable the pci
device when detached. It's only called from i_ADDI_Detach().
Move the code there and delete the function.

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>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
index 08b32406e04fc1555b60dccc206e74d799c717f7..2011f4bb304682b0ae2a865b3a714ac6dd1a2c80 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
@@ -225,8 +225,6 @@ struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
                                                    unsigned short pci_bus,
                                                    unsigned short pci_slot);
 
-int i_pci_card_free(struct pcilst_struct *amcc);
-
 /****************************************************************************/
 
 /* build list of amcc cards in this system */
@@ -326,20 +324,6 @@ int i_find_free_pci_card_by_position(unsigned short vendor_id,
        return 1;
 }
 
-/****************************************************************************/
-/* mark card as free */
-int i_pci_card_free(struct pcilst_struct *amcc)
-{
-       if (!amcc)
-               return -1;
-
-       if (!amcc->used)
-               return 1;
-       amcc->used = 0;
-       comedi_pci_disable(amcc->pcidev);
-       return 0;
-}
-
 /****************************************************************************/
 /* select and alloc card */
 struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 2dab403ac26468d3f639ec4ea74aeb3ef7aeaaf6..f6c36ac93b2bf3554865e8671f9bb5241d62348e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -402,8 +402,10 @@ static void i_ADDI_Detach(struct comedi_device *dev)
                        free_irq(dev->irq, dev);
                if ((this_board->pc_EepromChip == NULL) ||
                    (strcmp(this_board->pc_EepromChip, ADDIDATA_9054) != 0)) {
-                       if (devpriv->allocated)
-                               i_pci_card_free(devpriv->amcc);
+                       if (devpriv->allocated) {
+                               comedi_pci_disable(devpriv->amcc->pcidev);
+                               devpriv->amcc->used = 0;
+                       }
                        if (devpriv->ul_DmaBufferVirtual[0]) {
                                free_pages((unsigned long)devpriv->
                                        ul_DmaBufferVirtual[0],
@@ -416,8 +418,10 @@ static void i_ADDI_Detach(struct comedi_device *dev)
                        }
                } else {
                        iounmap(devpriv->dw_AiBase);
-                       if (devpriv->allocated)
-                               i_pci_card_free(devpriv->amcc);
+                       if (devpriv->allocated) {
+                               comedi_pci_disable(devpriv->amcc->pcidev);
+                               devpriv->amcc->used = 0;
+                       }
                }
                if (pci_list_builded) {
                        v_pci_card_list_cleanup(this_board->i_VendorId);