d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the "driver" field to "bsddriver" to avoid a name collision.

Browse Source 
MFC after:	1 week
This commit is contained in:
Mark Johnston 2017-07-04 00:30:48 +00:00
parent 1b069f1c69
commit b38dc0a16d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/linuxkpi/common/include/linux/pci.h
View File

@ -175,7 +175,7 @@ struct pci_driver {
int (*suspend) (struct pci_dev *dev, pm_message_t state); /* Device suspended */
int (*resume) (struct pci_dev *dev); /* Device woken up */
void (*shutdown) (struct pci_dev *dev); /* Device shutdown */
driver_t driver;
driver_t bsddriver;
devclass_t bsdclass;
const struct pci_error_handlers *err_handler;
};

15
sys/compat/linuxkpi/common/src/linux_pci.c
View File

@ -108,7 +108,7 @@ linux_pci_probe(device_t dev)
if ((pdrv = linux_pci_find(dev, &id)) == NULL)
return (ENXIO);
if (device_get_driver(dev) != &pdrv->driver)
if (device_get_driver(dev) != &pdrv->bsddriver)
return (ENXIO);
device_set_desc(dev, pdrv->name);
return (0);
@ -235,13 +235,14 @@ pci_register_driver(struct pci_driver *pdrv)
spin_lock(&pci_lock);
list_add(&pdrv->links, &pci_drivers);
spin_unlock(&pci_lock);
pdrv->driver.name = pdrv->name;
pdrv->driver.methods = pci_methods;
pdrv->driver.size = sizeof(struct pci_dev);
pdrv->bsddriver.name = pdrv->name;
pdrv->bsddriver.methods = pci_methods;
pdrv->bsddriver.size = sizeof(struct pci_dev);
mtx_lock(&Giant);
if (bus != NULL) {
error = devclass_add_driver(bus, &pdrv->driver, BUS_PASS_DEFAULT,
&pdrv->bsdclass);
error = devclass_add_driver(bus, &pdrv->bsddriver,
BUS_PASS_DEFAULT, &pdrv->bsdclass);
}
mtx_unlock(&Giant);
return (-error);
@ -259,7 +260,7 @@ pci_unregister_driver(struct pci_driver *pdrv)
spin_unlock(&pci_lock);
mtx_lock(&Giant);
if (bus != NULL)
devclass_delete_driver(bus, &pdrv->driver);
devclass_delete_driver(bus, &pdrv->bsddriver);
mtx_unlock(&Giant);
}