FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-21 21:02:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: me4000: store the pci_dev in the comedi_device

Browse Source 
Use the hw_dev pointer in the comedi_device struct to hold the
pci_dev instead of carrying it in the private data.

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-09-07 17:46:51 -07:00 committed by Greg Kroah-Hartman
parent 4b2f15f138
commit f4c772f0c3
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/me4000.c
View File

@ -1778,7 +1778,6 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
}
dev->board_ptr = me4000_boards + i;
board = comedi_board(dev);
info->pci_dev_p = pci_device;
goto found;
}
}
@ -1787,6 +1786,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENODEV;
found:
comedi_set_hw_dev(dev, &pci_device->dev);
dev->board_name = board->name;
result = comedi_pci_enable(pci_device, dev->board_name);
@ -1944,15 +1944,14 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void me4000_detach(struct comedi_device *dev)
{
struct me4000_info *info = dev->private;
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
if (info) {
if (info->pci_dev_p) {
if (pcidev) {
if (dev->iobase) {
reset_board(dev);
if (info->plx_regbase)
comedi_pci_disable(info->pci_dev_p);
pci_dev_put(info->pci_dev_p);
comedi_pci_disable(pcidev);
}
pci_dev_put(pcidev);
}
}

2
drivers/staging/comedi/drivers/me4000.h
View File

@ -222,8 +222,6 @@ struct me4000_info {
unsigned long timer_regbase; /* Base address of the timer circuit */
unsigned long program_regbase; /* Base address to set the program pin for the xilinx */
struct pci_dev *pci_dev_p; /* General PCI information */
unsigned int ao_readback[4];
};