]> git.baikalelectronics.ru Git - kernel.git/commit
staging: comedi: addi-data: absorb pci_card_alloc() into i_ADDI_Attach()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 31 Oct 2012 23:56:11 +0000 (16:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Nov 2012 15:43:24 +0000 (08:43 -0700)
commitb1065bd4b7b8b5e7de78ffacc45bab6b07d3b8aa
tree6f0ec440ed2a971d834e3497a32241ebac9f1d25
parenteb217957c452a5e20f385453f2c76037730689e1
staging: comedi: addi-data: absorb pci_card_alloc() into i_ADDI_Attach()

The function pci_card_alloc() enables the pci device by calling
comedi_pci_enable() and then optionally calls pci_set_master() to
enable bus mastering for DMA.

Absorb this code directly into i_ADDI_Attach() as is more typical
for comedi PCI drivers. Also, remove the now unused i_Master
parameter from ptr_select_and_alloc_pci_card().

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>
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
drivers/staging/comedi/drivers/addi-data/addi_common.c