diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-15 07:25:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-17 07:31:21 +0200 |
| commit | f49f067bdd0f317b8e21ead8dac917c4f971fb3f (patch) | |
| tree | 714040e45d65157be85529ad3bf3c064bc8fb0e8 /drivers/pci | |
| parent | bd3e5011346e3d4d03ac076ada5768c2cf197dc4 (diff) | |
| download | barebox-f49f067bdd0f317b8e21ead8dac917c4f971fb3f.tar.gz barebox-f49f067bdd0f317b8e21ead8dac917c4f971fb3f.tar.xz | |
pci: Do not abuse dev->priv for storing data
dev->priv is for private use of the device driver, so do not
use it in the pci core. Instead, introduce a id field in struct
pci_device.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index d6c5496ad7..201675b486 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -27,11 +27,11 @@ static int pci_match(struct device_d *dev, struct driver_d *drv) { struct pci_dev *pdev = to_pci_dev(dev); struct pci_driver *pdrv = to_pci_driver(drv); - struct pci_device_id *id; + const struct pci_device_id *id; - for (id = (struct pci_device_id *)pdrv->id_table; id->vendor; id++) + for (id = pdrv->id_table; id->vendor; id++) if (pci_match_one_device(id, pdev)) { - dev->priv = id; + pdev->id = id; return 0; } @@ -43,7 +43,7 @@ static int pci_probe(struct device_d *dev) struct pci_dev *pdev = to_pci_dev(dev); struct pci_driver *pdrv = to_pci_driver(dev->driver); - return pdrv->probe(pdev, dev->priv); + return pdrv->probe(pdev, pdev->id); } static void pci_remove(struct device_d *dev) |