From bd9089edc40b9e2b26709bad6fca4448ebd98411 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 16 Oct 2005 21:32:46 +0100 Subject: [PATCH] --- yaml --- r: 10687 b: refs/heads/master c: 5457b6a6013516a73b8f48ec1adb9984b577a5c1 h: refs/heads/master i: 10685: efefecf72d25018e3e7ea6a00f1864c8bf11e22f 10683: 121956bfc7f57d46777da4b4e32346c33d870cb5 10679: a6adeafff6035ff956d64b763b22d15ad5e210b6 10671: 7bac694053ca1248d402c3b6fca4e3c833c73d73 10655: ad2dcd745ee07d80ffd155f7a329fbf1a9372842 10623: 1598fbfe52c4d8b0742a2361fccf7362720d1ba7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_mbox.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 401d55a48e46..8066b55e9ade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1720fdbd0f90e64668a59a304d01c5ba001b450 +refs/heads/master: 5457b6a6013516a73b8f48ec1adb9984b577a5c1 diff --git a/trunk/drivers/scsi/megaraid/megaraid_mbox.c b/trunk/drivers/scsi/megaraid/megaraid_mbox.c index d47be8e0ea3a..c9e743ba09ec 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_mbox.c +++ b/trunk/drivers/scsi/megaraid/megaraid_mbox.c @@ -76,7 +76,7 @@ static void megaraid_exit(void); static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *); 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 void megaraid_io_detach(adapter_t *); @@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_driver_g = { .id_table = pci_id_table_g, .probe = megaraid_probe_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) * Shutdown notification, perform flush cache */ 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; if (!adapter) {