Commit 5457b6a6 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman

[PATCH] PCI: Convert megaraid to use pci_driver shutdown method

Convert megaraid to use pci_driver's shutdown method rather than
the generic device_driver shutdown method.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a1720fdb
...@@ -76,7 +76,7 @@ static void megaraid_exit(void); ...@@ -76,7 +76,7 @@ static void megaraid_exit(void);
static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *); static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *);
static void megaraid_detach_one(struct pci_dev *); static void megaraid_detach_one(struct pci_dev *);
static void megaraid_mbox_shutdown(struct device *); static void megaraid_mbox_shutdown(struct pci_dev *);
static int megaraid_io_attach(adapter_t *); static int megaraid_io_attach(adapter_t *);
static void megaraid_io_detach(adapter_t *); static void megaraid_io_detach(adapter_t *);
...@@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_driver_g = { ...@@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_driver_g = {
.id_table = pci_id_table_g, .id_table = pci_id_table_g,
.probe = megaraid_probe_one, .probe = megaraid_probe_one,
.remove = __devexit_p(megaraid_detach_one), .remove = __devexit_p(megaraid_detach_one),
.driver = { .shutdown = megaraid_mbox_shutdown,
.shutdown = megaraid_mbox_shutdown,
}
}; };
...@@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev) ...@@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev)
* Shutdown notification, perform flush cache * Shutdown notification, perform flush cache
*/ */
static void static void
megaraid_mbox_shutdown(struct device *device) megaraid_mbox_shutdown(struct pci_dev *pdev)
{ {
adapter_t *adapter = pci_get_drvdata(to_pci_dev(device)); adapter_t *adapter = pci_get_drvdata(pdev);
static int counter; static int counter;
if (!adapter) { if (!adapter) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment