evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: das08: Remove pci_iobase from private data

Browse source 
The `pci_iobase` I/O port registers from PCI BAR 1 are never accessed,
so don't bother storing this base address in `struct
das08_private_struct`.

The `pci_iobase` member was checked for non-zero in `das08_detach()` but
we can check `dev->iobase` is non-zero instead.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2012-08-31 20:41:38 +01:00 • committed by Greg Kroah-Hartman
parent 9fcd4853f7
commit fb8ff5d501
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/das08.c
View file

@ -749,7 +749,6 @@ static int das08_pci_attach_common(struct comedi_device *dev,
struct pci_dev *pdev) struct pci_dev *pdev)
{ {
unsigned long iobase; unsigned long iobase;
unsigned long pci_iobase;
struct das08_private_struct *devpriv = dev->private; struct das08_private_struct *devpriv = dev->private;
if (!IS_ENABLED(CONFIG_COMEDI_DAS08_PCI)) if (!IS_ENABLED(CONFIG_COMEDI_DAS08_PCI))
@ -763,11 +762,8 @@ static int das08_pci_attach_common(struct comedi_device *dev,
return -EIO; return -EIO;
} }
/* read base addresses */ /* read base addresses */
pci_iobase = pci_resource_start(pdev, 1);
iobase = pci_resource_start(pdev, 2); iobase = pci_resource_start(pdev, 2);
dev_info(dev->class_dev, "pcibase 0x%lx iobase 0x%lx\n", dev_info(dev->class_dev, "iobase 0x%lx\n", iobase);
pci_iobase, iobase);
devpriv->pci_iobase = pci_iobase;
return das08_common_attach(dev, iobase); return das08_common_attach(dev, iobase);
} }
@ -914,7 +910,7 @@ static void __maybe_unused das08_detach(struct comedi_device *dev)
} else if (IS_ENABLED(CONFIG_COMEDI_DAS08_PCI) && } else if (IS_ENABLED(CONFIG_COMEDI_DAS08_PCI) &&
thisboard->bustype == pci) { thisboard->bustype == pci) {
if (devpriv && devpriv->pdev) { if (devpriv && devpriv->pdev) {
if (devpriv->pci_iobase) if (dev->iobase)
comedi_pci_disable(devpriv->pdev); comedi_pci_disable(devpriv->pdev);
pci_dev_put(devpriv->pdev); pci_dev_put(devpriv->pdev);
} }

1
drivers/staging/comedi/drivers/das08.h
View file

@ -52,7 +52,6 @@ struct das08_private_struct {
unsigned int do_bits; /* bits for do register on boards with register dedicated to digital out only */ unsigned int do_bits; /* bits for do register on boards with register dedicated to digital out only */
const unsigned int *pg_gainlist; const unsigned int *pg_gainlist;
struct pci_dev *pdev; /* struct for pci-das08 */ struct pci_dev *pdev; /* struct for pci-das08 */
unsigned int pci_iobase; /* additional base address for pci-das08 */
unsigned int i8254_iobase; unsigned int i8254_iobase;
}; };