Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-10-31 16:57:22 -07:00 committed by Greg Kroah-Hartman
parent f7a9fd153b
commit a43163c9bb
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
View File

@ -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,

12
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@ -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);