diff options
Diffstat (limited to 'drivers/eisa')
| -rw-r--r-- | drivers/eisa/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/eisa/Makefile | 2 | ||||
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 271 | ||||
| -rw-r--r-- | drivers/eisa/eisa.ids | 9 | ||||
| -rw-r--r-- | drivers/eisa/pci_eisa.c | 74 | ||||
| -rw-r--r-- | drivers/eisa/virtual_root.c | 2 |
6 files changed, 202 insertions, 162 deletions
diff --git a/drivers/eisa/Kconfig b/drivers/eisa/Kconfig index c0646576cf4..2705284f622 100644 --- a/drivers/eisa/Kconfig +++ b/drivers/eisa/Kconfig @@ -3,7 +3,7 @@ # config EISA_VLB_PRIMING bool "Vesa Local Bus priming" - depends on X86_PC && EISA + depends on X86 && EISA default n ---help--- Activate this option if your system contains a Vesa Local @@ -24,11 +24,11 @@ config EISA_PCI_EISA When in doubt, say Y. # Using EISA_VIRTUAL_ROOT on something other than an Alpha or -# an X86_PC may lead to crashes... +# an X86 may lead to crashes... config EISA_VIRTUAL_ROOT bool "EISA virtual root device" - depends on EISA && (ALPHA || X86_PC) + depends on EISA && (ALPHA || X86) default y ---help--- Activate this option if your system only have EISA bus diff --git a/drivers/eisa/Makefile b/drivers/eisa/Makefile index 70abf93fe6b..5369ce957c6 100644 --- a/drivers/eisa/Makefile +++ b/drivers/eisa/Makefile @@ -9,7 +9,7 @@ obj-${CONFIG_EISA_VIRTUAL_ROOT} += virtual_root.o # Ugly hack to get DEVICE_NAME_SIZE value... -DEVICE_NAME_SIZE =$(shell awk '$$1=="\#define" && $$2=="DEVICE_NAME_SIZE" {print $$3-1}' $(srctree)/include/linux/device.h) +DEVICE_NAME_SIZE = 50 $(obj)/eisa-bus.o: $(obj)/devlist.h diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 65dcf043265..612afeaec3c 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c @@ -22,7 +22,7 @@ struct eisa_device_info { struct eisa_device_id id; - char name[DEVICE_NAME_SIZE]; + char name[50]; }; #ifdef CONFIG_EISA_NAMES @@ -39,10 +39,10 @@ static unsigned int enable_dev_count; static int disable_dev[EISA_MAX_FORCED_DEV]; static unsigned int disable_dev_count; -static int is_forced_dev (int *forced_tab, - int forced_count, - struct eisa_root_device *root, - struct eisa_device *edev) +static int is_forced_dev(int *forced_tab, + int forced_count, + struct eisa_root_device *root, + struct eisa_device *edev) { int i, x; @@ -55,21 +55,21 @@ static int is_forced_dev (int *forced_tab, return 0; } -static void __init eisa_name_device (struct eisa_device *edev) +static void __init eisa_name_device(struct eisa_device *edev) { #ifdef CONFIG_EISA_NAMES int i; for (i = 0; i < EISA_INFOS; i++) { - if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) { - strlcpy (edev->pretty_name, - eisa_table[i].name, - DEVICE_NAME_SIZE); + if (!strcmp(edev->id.sig, eisa_table[i].id.sig)) { + strlcpy(edev->pretty_name, + eisa_table[i].name, + sizeof(edev->pretty_name)); return; } } /* No name was found */ - sprintf (edev->pretty_name, "EISA device %.7s", edev->id.sig); + sprintf(edev->pretty_name, "EISA device %.7s", edev->id.sig); #endif } @@ -91,7 +91,7 @@ static char __init *decode_eisa_sig(unsigned long addr) */ outb(0x80 + i, addr); #endif - sig[i] = inb (addr + i); + sig[i] = inb(addr + i); if (!i && (sig[0] & 0x80)) return NULL; @@ -106,17 +106,17 @@ static char __init *decode_eisa_sig(unsigned long addr) return sig_str; } -static int eisa_bus_match (struct device *dev, struct device_driver *drv) +static int eisa_bus_match(struct device *dev, struct device_driver *drv) { - struct eisa_device *edev = to_eisa_device (dev); - struct eisa_driver *edrv = to_eisa_driver (drv); + struct eisa_device *edev = to_eisa_device(dev); + struct eisa_driver *edrv = to_eisa_driver(drv); const struct eisa_device_id *eids = edrv->id_table; if (!eids) return 0; - while (strlen (eids->sig)) { - if (!strcmp (eids->sig, edev->id.sig) && + while (strlen(eids->sig)) { + if (!strcmp(eids->sig, edev->id.sig) && edev->state & EISA_CONFIG_ENABLED) { edev->id.driver_data = eids->driver_data; return 1; @@ -141,66 +141,76 @@ struct bus_type eisa_bus_type = { .match = eisa_bus_match, .uevent = eisa_bus_uevent, }; +EXPORT_SYMBOL(eisa_bus_type); -int eisa_driver_register (struct eisa_driver *edrv) +int eisa_driver_register(struct eisa_driver *edrv) { edrv->driver.bus = &eisa_bus_type; - return driver_register (&edrv->driver); + return driver_register(&edrv->driver); } +EXPORT_SYMBOL(eisa_driver_register); -void eisa_driver_unregister (struct eisa_driver *edrv) +void eisa_driver_unregister(struct eisa_driver *edrv) { - driver_unregister (&edrv->driver); + driver_unregister(&edrv->driver); } +EXPORT_SYMBOL(eisa_driver_unregister); -static ssize_t eisa_show_sig (struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t eisa_show_sig(struct device *dev, struct device_attribute *attr, + char *buf) { - struct eisa_device *edev = to_eisa_device (dev); - return sprintf (buf,"%s\n", edev->id.sig); + struct eisa_device *edev = to_eisa_device(dev); + return sprintf(buf, "%s\n", edev->id.sig); } static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL); -static ssize_t eisa_show_state (struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t eisa_show_state(struct device *dev, + struct device_attribute *attr, + char *buf) { - struct eisa_device *edev = to_eisa_device (dev); - return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED); + struct eisa_device *edev = to_eisa_device(dev); + return sprintf(buf, "%d\n", edev->state & EISA_CONFIG_ENABLED); } static DEVICE_ATTR(enabled, S_IRUGO, eisa_show_state, NULL); -static ssize_t eisa_show_modalias (struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t eisa_show_modalias(struct device *dev, + struct device_attribute *attr, + char *buf) { - struct eisa_device *edev = to_eisa_device (dev); - return sprintf (buf, EISA_DEVICE_MODALIAS_FMT "\n", edev->id.sig); + struct eisa_device *edev = to_eisa_device(dev); + return sprintf(buf, EISA_DEVICE_MODALIAS_FMT "\n", edev->id.sig); } static DEVICE_ATTR(modalias, S_IRUGO, eisa_show_modalias, NULL); -static int __init eisa_init_device (struct eisa_root_device *root, - struct eisa_device *edev, - int slot) +static int __init eisa_init_device(struct eisa_root_device *root, + struct eisa_device *edev, + int slot) { char *sig; - unsigned long sig_addr; + unsigned long sig_addr; int i; - sig_addr = SLOT_ADDRESS (root, slot) + EISA_VENDOR_ID_OFFSET; + sig_addr = SLOT_ADDRESS(root, slot) + EISA_VENDOR_ID_OFFSET; - if (!(sig = decode_eisa_sig (sig_addr))) + sig = decode_eisa_sig(sig_addr); + if (!sig) return -1; /* No EISA device here */ - memcpy (edev->id.sig, sig, EISA_SIG_LEN); + memcpy(edev->id.sig, sig, EISA_SIG_LEN); edev->slot = slot; - edev->state = inb (SLOT_ADDRESS (root, slot) + EISA_CONFIG_OFFSET) & EISA_CONFIG_ENABLED; - edev->base_addr = SLOT_ADDRESS (root, slot); + edev->state = inb(SLOT_ADDRESS(root, slot) + EISA_CONFIG_OFFSET) + & EISA_CONFIG_ENABLED; + edev->base_addr = SLOT_ADDRESS(root, slot); edev->dma_mask = root->dma_mask; /* Default DMA mask */ - eisa_name_device (edev); + eisa_name_device(edev); edev->dev.parent = root->dev; edev->dev.bus = &eisa_bus_type; edev->dev.dma_mask = &edev->dma_mask; edev->dev.coherent_dma_mask = edev->dma_mask; - sprintf (edev->dev.bus_id, "%02X:%02X", root->bus_nr, slot); + dev_set_name(&edev->dev, "%02X:%02X", root->bus_nr, slot); for (i = 0; i < EISA_MAX_RESOURCES; i++) { #ifdef CONFIG_EISA_NAMES @@ -210,42 +220,47 @@ static int __init eisa_init_device (struct eisa_root_device *root, #endif } - if (is_forced_dev (enable_dev, enable_dev_count, root, edev)) + if (is_forced_dev(enable_dev, enable_dev_count, root, edev)) edev->state = EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED; - if (is_forced_dev (disable_dev, disable_dev_count, root, edev)) + if (is_forced_dev(disable_dev, disable_dev_count, root, edev)) edev->state = EISA_CONFIG_FORCED; return 0; } -static int __init eisa_register_device (struct eisa_device *edev) +static int __init eisa_register_device(struct eisa_device *edev) { - int rc = device_register (&edev->dev); - if (rc) + int rc = device_register(&edev->dev); + if (rc) { + put_device(&edev->dev); return rc; + } - rc = device_create_file (&edev->dev, &dev_attr_signature); - if (rc) goto err_devreg; - rc = device_create_file (&edev->dev, &dev_attr_enabled); - if (rc) goto err_sig; - rc = device_create_file (&edev->dev, &dev_attr_modalias); - if (rc) goto err_enab; + rc = device_create_file(&edev->dev, &dev_attr_signature); + if (rc) + goto err_devreg; + rc = device_create_file(&edev->dev, &dev_attr_enabled); + if (rc) + goto err_sig; + rc = device_create_file(&edev->dev, &dev_attr_modalias); + if (rc) + goto err_enab; return 0; err_enab: - device_remove_file (&edev->dev, &dev_attr_enabled); + device_remove_file(&edev->dev, &dev_attr_enabled); err_sig: - device_remove_file (&edev->dev, &dev_attr_signature); + device_remove_file(&edev->dev, &dev_attr_signature); err_devreg: device_unregister(&edev->dev); return rc; } -static int __init eisa_request_resources (struct eisa_root_device *root, - struct eisa_device *edev, - int slot) +static int __init eisa_request_resources(struct eisa_root_device *root, + struct eisa_device *edev, + int slot) { int i; @@ -263,17 +278,19 @@ static int __init eisa_request_resources (struct eisa_root_device *root, if (slot) { edev->res[i].name = NULL; - edev->res[i].start = SLOT_ADDRESS (root, slot) + (i * 0x400); + edev->res[i].start = SLOT_ADDRESS(root, slot) + + (i * 0x400); edev->res[i].end = edev->res[i].start + 0xff; edev->res[i].flags = IORESOURCE_IO; } else { edev->res[i].name = NULL; - edev->res[i].start = SLOT_ADDRESS (root, slot) + EISA_VENDOR_ID_OFFSET; + edev->res[i].start = SLOT_ADDRESS(root, slot) + + EISA_VENDOR_ID_OFFSET; edev->res[i].end = edev->res[i].start + 3; - edev->res[i].flags = IORESOURCE_BUSY; + edev->res[i].flags = IORESOURCE_IO | IORESOURCE_BUSY; } - if (request_resource (root->res, &edev->res[i])) + if (request_resource(root->res, &edev->res[i])) goto failed; } @@ -281,116 +298,110 @@ static int __init eisa_request_resources (struct eisa_root_device *root, failed: while (--i >= 0) - release_resource (&edev->res[i]); + release_resource(&edev->res[i]); return -1; } -static void __init eisa_release_resources (struct eisa_device *edev) +static void __init eisa_release_resources(struct eisa_device *edev) { int i; for (i = 0; i < EISA_MAX_RESOURCES; i++) if (edev->res[i].start || edev->res[i].end) - release_resource (&edev->res[i]); + release_resource(&edev->res[i]); } -static int __init eisa_probe (struct eisa_root_device *root) +static int __init eisa_probe(struct eisa_root_device *root) { int i, c; struct eisa_device *edev; + char *enabled_str; - printk (KERN_INFO "EISA: Probing bus %d at %s\n", - root->bus_nr, root->dev->bus_id); + dev_info(root->dev, "Probing EISA bus %d\n", root->bus_nr); /* First try to get hold of slot 0. If there is no device * here, simply fail, unless root->force_probe is set. */ - if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) { - printk (KERN_ERR "EISA: Couldn't allocate mainboard slot\n"); + edev = kzalloc(sizeof(*edev), GFP_KERNEL); + if (!edev) { + dev_err(root->dev, "EISA: Couldn't allocate mainboard slot\n"); return -ENOMEM; } - if (eisa_request_resources (root, edev, 0)) { - printk (KERN_WARNING \ - "EISA: Cannot allocate resource for mainboard\n"); - kfree (edev); + if (eisa_request_resources(root, edev, 0)) { + dev_warn(root->dev, + "EISA: Cannot allocate resource for mainboard\n"); + kfree(edev); if (!root->force_probe) return -EBUSY; goto force_probe; } - if (eisa_init_device (root, edev, 0)) { - eisa_release_resources (edev); - kfree (edev); + if (eisa_init_device(root, edev, 0)) { + eisa_release_resources(edev); + kfree(edev); if (!root->force_probe) return -ENODEV; goto force_probe; } - printk (KERN_INFO "EISA: Mainboard %s detected.\n", edev->id.sig); + dev_info(&edev->dev, "EISA: Mainboard %s detected\n", edev->id.sig); - if (eisa_register_device (edev)) { - printk (KERN_ERR "EISA: Failed to register %s\n", - edev->id.sig); - eisa_release_resources (edev); - kfree (edev); + if (eisa_register_device(edev)) { + dev_err(&edev->dev, "EISA: Failed to register %s\n", + edev->id.sig); + eisa_release_resources(edev); + kfree(edev); } force_probe: for (c = 0, i = 1; i <= root->slots; i++) { - if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) { - printk (KERN_ERR "EISA: Out of memory for slot %d\n", + edev = kzalloc(sizeof(*edev), GFP_KERNEL); + if (!edev) { + dev_err(root->dev, "EISA: Out of memory for slot %d\n", i); continue; } - if (eisa_request_resources (root, edev, i)) { - printk (KERN_WARNING \ - "Cannot allocate resource for EISA slot %d\n", - i); - kfree (edev); + if (eisa_request_resources(root, edev, i)) { + dev_warn(root->dev, + "Cannot allocate resource for EISA slot %d\n", + i); + kfree(edev); continue; } - if (eisa_init_device (root, edev, i)) { - eisa_release_resources (edev); - kfree (edev); + if (eisa_init_device(root, edev, i)) { + eisa_release_resources(edev); + kfree(edev); continue; } - - printk (KERN_INFO "EISA: slot %d : %s detected", - i, edev->id.sig); - - switch (edev->state) { - case EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED: - printk (" (forced enabled)"); - break; - - case EISA_CONFIG_FORCED: - printk (" (forced disabled)"); - break; - - case 0: - printk (" (disabled)"); - break; - } - - printk (".\n"); + + if (edev->state == (EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED)) + enabled_str = " (forced enabled)"; + else if (edev->state == EISA_CONFIG_FORCED) + enabled_str = " (forced disabled)"; + else if (edev->state == 0) + enabled_str = " (disabled)"; + else + enabled_str = ""; + + dev_info(&edev->dev, "EISA: slot %d: %s detected%s\n", i, + edev->id.sig, enabled_str); c++; - if (eisa_register_device (edev)) { - printk (KERN_ERR "EISA: Failed to register %s\n", - edev->id.sig); - eisa_release_resources (edev); - kfree (edev); + if (eisa_register_device(edev)) { + dev_err(&edev->dev, "EISA: Failed to register %s\n", + edev->id.sig); + eisa_release_resources(edev); + kfree(edev); } } - printk (KERN_INFO "EISA: Detected %d card%s.\n", c, c == 1 ? "" : "s"); - + dev_info(root->dev, "EISA: Detected %d card%s\n", c, c == 1 ? "" : "s"); return 0; } @@ -403,7 +414,7 @@ static struct resource eisa_root_res = { static int eisa_bus_count; -int __init eisa_root_register (struct eisa_root_device *root) +int __init eisa_root_register(struct eisa_root_device *root) { int err; @@ -417,35 +428,35 @@ int __init eisa_root_register (struct eisa_root_device *root) root->eisa_root_res.end = root->res->end; root->eisa_root_res.flags = IORESOURCE_BUSY; - if ((err = request_resource (&eisa_root_res, &root->eisa_root_res))) + err = request_resource(&eisa_root_res, &root->eisa_root_res); + if (err) return err; root->bus_nr = eisa_bus_count++; - if ((err = eisa_probe (root))) - release_resource (&root->eisa_root_res); + err = eisa_probe(root); + if (err) + release_resource(&root->eisa_root_res); return err; } -static int __init eisa_init (void) +static int __init eisa_init(void) { int r; - if ((r = bus_register (&eisa_bus_type))) + r = bus_register(&eisa_bus_type); + if (r) return r; - printk (KERN_INFO "EISA bus registered\n"); + printk(KERN_INFO "EISA bus registered\n"); return 0; } module_param_array(enable_dev, int, &enable_dev_count, 0444); module_param_array(disable_dev, int, &disable_dev_count, 0444); -postcore_initcall (eisa_init); +postcore_initcall(eisa_init); int EISA_bus; /* for legacy drivers */ -EXPORT_SYMBOL (EISA_bus); -EXPORT_SYMBOL (eisa_bus_type); -EXPORT_SYMBOL (eisa_driver_register); -EXPORT_SYMBOL (eisa_driver_unregister); +EXPORT_SYMBOL(EISA_bus); diff --git a/drivers/eisa/eisa.ids b/drivers/eisa/eisa.ids index ed69837d8b7..2d864b48a48 100644 --- a/drivers/eisa/eisa.ids +++ b/drivers/eisa/eisa.ids @@ -985,8 +985,8 @@ ISABD00 "Racal-Interlan NP600A Ethernet 16bit" ISABD02 "Racal-Interlan NI5210/8 Ethernet" ISABD03 "Racal-Interlan NI5210/16 Ethernet" ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board" -ISABE01 "Qua Tech ES-100 8 Channel Asyncronous" -ISABE02 "Qua Tech QS-100M 4 Channel Asyncronous" +ISABE01 "Qua Tech ES-100 8 Channel Asynchronous" +ISABE02 "Qua Tech QS-100M 4 Channel Asynchronous" ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB" ISABE04 "Qua Tech DS-201 Dual Channel RS-422" ISABE05 "Qua Tech PXB-721 Parallel Expansion" @@ -1140,6 +1140,11 @@ NON0301 "c't Universale Graphic Adapter" NON0401 "c't Universal Ethernet Adapter" NON0501 "c't Universal 16-Bit Sound Adapter" NON0601 "c't Universal 8-Bit Adapter" +NPI0120 "Network Peripherals NP-EISA-1 FDDI Interface" +NPI0221 "Network Peripherals NP-EISA-2 FDDI Interface" +NPI0223 "Network Peripherals NP-EISA-2E Enhanced FDDI Interface" +NPI0301 "Network Peripherals NP-EISA-3 FDDI Interface" +NPI0303 "Network Peripherals NP-EISA-3E Enhanced FDDI Interface" NSS0011 "Newport Systems Solutions WNIC Adapter" NVL0701 "Novell NE3200 Bus Master Ethernet" NVL0702 "Novell NE3200T Bus Master Ethernet" diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c index 74edb1d0110..a333bf3517d 100644 --- a/drivers/eisa/pci_eisa.c +++ b/drivers/eisa/pci_eisa.c @@ -19,48 +19,72 @@ /* There is only *one* pci_eisa device per machine, right ? */ static struct eisa_root_device pci_eisa_root; -static int __init pci_eisa_init(struct pci_dev *pdev, - const struct pci_device_id *ent) +static int __init pci_eisa_init(struct pci_dev *pdev) { - int rc; + int rc, i; + struct resource *res, *bus_res = NULL; if ((rc = pci_enable_device (pdev))) { - printk (KERN_ERR "pci_eisa : Could not enable device %s\n", - pci_name(pdev)); + dev_err(&pdev->dev, "Could not enable device\n"); return rc; } + /* + * The Intel 82375 PCI-EISA bridge is a subtractive-decode PCI + * device, so the resources available on EISA are the same as those + * available on the 82375 bus. This works the same as a PCI-PCI + * bridge in subtractive-decode mode (see pci_read_bridge_bases()). + * We assume other PCI-EISA bridges are similar. + * + * eisa_root_register() can only deal with a single io port resource, + * so we use the first valid io port resource. + */ + pci_bus_for_each_resource(pdev->bus, res, i) + if (res && (res->flags & IORESOURCE_IO)) { + bus_res = res; + break; + } + + if (!bus_res) { + dev_err(&pdev->dev, "No resources available\n"); + return -1; + } + 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.res = bus_res; + pci_eisa_root.bus_base_addr = bus_res->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"); + dev_err(&pdev->dev, "Could not register EISA root\n"); return -1; } return 0; } -static struct pci_device_id pci_eisa_pci_tbl[] = { - { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_BRIDGE_EISA << 8, 0xffff00, 0 }, - { 0, } -}; +/* + * We have to call pci_eisa_init_early() before pnpacpi_init()/isapnp_init(). + * Otherwise pnp resource will get enabled early and could prevent eisa + * to be initialized. + * Also need to make sure pci_eisa_init_early() is called after + * x86/pci_subsys_init(). + * So need to use subsys_initcall_sync with it. + */ +static int __init pci_eisa_init_early(void) +{ + struct pci_dev *dev = NULL; + int ret; -static struct pci_driver pci_eisa_driver = { - .name = "pci_eisa", - .id_table = pci_eisa_pci_tbl, - .probe = pci_eisa_init, -}; + for_each_pci_dev(dev) + if ((dev->class >> 8) == PCI_CLASS_BRIDGE_EISA) { + ret = pci_eisa_init(dev); + if (ret) + return ret; + } -static int __init pci_eisa_init_module (void) -{ - return pci_register_driver (&pci_eisa_driver); + return 0; } - -device_initcall(pci_eisa_init_module); -MODULE_DEVICE_TABLE(pci, pci_eisa_pci_tbl); +subsys_initcall_sync(pci_eisa_init_early); diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c index 3074879f231..535e4f9c83f 100644 --- a/drivers/eisa/virtual_root.c +++ b/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 |