From 500089d7318dc5c10077fcc4c0eeaf4e85f83042 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 30 Apr 2009 14:43:31 -0700 Subject: [PATCH] --- yaml --- r: 151267 b: refs/heads/master c: 4b9d0d3b81ec0900971cbe8aba8ba0ae9c08a087 h: refs/heads/master i: 151265: 9d66b8e0dbd91e1ffbd1a8fd78287da38d02d36f 151263: 01ac14ebb4eadbc46837f4923755278229e9264d v: v3 --- [refs] | 2 +- trunk/drivers/eisa/pci_eisa.c | 2 +- trunk/drivers/eisa/virtual_root.c | 2 +- trunk/include/linux/eisa.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fb8cd07e35a9..712e4747d281 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bdf914915e98fe82495d05741a57e37f4b604e8 +refs/heads/master: 4b9d0d3b81ec0900971cbe8aba8ba0ae9c08a087 diff --git a/trunk/drivers/eisa/pci_eisa.c b/trunk/drivers/eisa/pci_eisa.c index 74edb1d0110f..0dd0f633b18d 100644 --- a/trunk/drivers/eisa/pci_eisa.c +++ b/trunk/drivers/eisa/pci_eisa.c @@ -31,11 +31,11 @@ static int __init pci_eisa_init(struct pci_dev *pdev, } pci_eisa_root.dev = &pdev->dev; - pci_eisa_root.dev->driver_data = &pci_eisa_root; pci_eisa_root.res = pdev->bus->resource[0]; pci_eisa_root.bus_base_addr = pdev->bus->resource[0]->start; pci_eisa_root.slots = EISA_MAX_SLOTS; pci_eisa_root.dma_mask = pdev->dma_mask; + dev_set_drvdata(pci_eisa_root.dev, &pci_eisa_root); if (eisa_root_register (&pci_eisa_root)) { printk (KERN_ERR "pci_eisa : Could not register EISA root\n"); diff --git a/trunk/drivers/eisa/virtual_root.c b/trunk/drivers/eisa/virtual_root.c index 3074879f231f..535e4f9c83f4 100644 --- a/trunk/drivers/eisa/virtual_root.c +++ b/trunk/drivers/eisa/virtual_root.c @@ -57,7 +57,7 @@ static int __init virtual_eisa_root_init (void) eisa_bus_root.force_probe = force_probe; - eisa_root_dev.dev.driver_data = &eisa_bus_root; + dev_set_drvdata(&eisa_root_dev.dev, &eisa_bus_root); if (eisa_root_register (&eisa_bus_root)) { /* A real bridge may have been registered before diff --git a/trunk/include/linux/eisa.h b/trunk/include/linux/eisa.h index e61c0be2a459..6925249a5ac6 100644 --- a/trunk/include/linux/eisa.h +++ b/trunk/include/linux/eisa.h @@ -78,12 +78,12 @@ static inline void eisa_driver_unregister (struct eisa_driver *edrv) { } /* Mimics pci.h... */ static inline void *eisa_get_drvdata (struct eisa_device *edev) { - return edev->dev.driver_data; + return dev_get_drvdata(&edev->dev); } static inline void eisa_set_drvdata (struct eisa_device *edev, void *data) { - edev->dev.driver_data = data; + dev_set_drvdata(&edev->dev, data); } /* The EISA root device. There's rumours about machines with multiple