projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging/comedi: Use comedi_pci_auto_unconfig directly for pci_driver.remove
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
comedi
/
drivers
/
cb_pcimdas.c
diff --git
a/drivers/staging/comedi/drivers/cb_pcimdas.c
b/drivers/staging/comedi/drivers/cb_pcimdas.c
index b43a5f80ac26ed19d3afb920dafe9cdb7a0e5b2a..709c5c670f40df1df93bd20c1e45d331345b4c6d 100644
(file)
--- a/
drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/
drivers/staging/comedi/drivers/cb_pcimdas.c
@@
-299,11
+299,6
@@
static int cb_pcimdas_pci_probe(struct pci_dev *dev,
return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
}
return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
}
-static void cb_pcimdas_pci_remove(struct pci_dev *dev)
-{
- comedi_pci_auto_unconfig(dev);
-}
-
static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
{ 0 }
static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
{ 0 }
@@
-314,7
+309,7
@@
static struct pci_driver cb_pcimdas_pci_driver = {
.name = "cb_pcimdas",
.id_table = cb_pcimdas_pci_table,
.probe = cb_pcimdas_pci_probe,
.name = "cb_pcimdas",
.id_table = cb_pcimdas_pci_table,
.probe = cb_pcimdas_pci_probe,
- .remove = c
b_pcimdas_pci_remove
,
+ .remove = c
omedi_pci_auto_unconfig
,
};
module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);
};
module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);