[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1339192416-27026-4-git-send-email-mathieu.poirier@linaro.org>
Date: Fri, 8 Jun 2012 15:53:32 -0600
From: mathieu.poirier@...aro.org
To: linux-scsi@...r.kernel.org
Cc: JBottomley@...allels.com, linux-kernel@...r.kernel.org,
arnd@...db.de, mathieu.poirier@...aro.org
Subject: [PATCH RESEND 3/7] drivers/scsi: use correct __devexit_p annotation
From: Arnd Bergmann <arnd@...db.de>
__devexit functions are discarded when CONFIG_HOTPLUG
is not set, so the symbol needs to be referenced carefully.
Signed-off-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@...aro.org>
---
drivers/scsi/pmcraid.c | 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index ea8a0b4..becc472 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -6084,7 +6084,7 @@ static struct pci_driver pmcraid_driver = {
.name = PMCRAID_DRIVER_NAME,
.id_table = pmcraid_pci_table,
.probe = pmcraid_probe,
- .remove = pmcraid_remove,
+ .remove = __devexit_p(pmcraid_remove),
.suspend = pmcraid_suspend,
.resume = pmcraid_resume,
.shutdown = pmcraid_shutdown
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index cd15678..760e8867 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -6058,7 +6058,7 @@ static struct pci_driver qla4xxx_pci_driver = {
.name = DRIVER_NAME,
.id_table = qla4xxx_pci_tbl,
.probe = qla4xxx_probe_adapter,
- .remove = qla4xxx_remove_adapter,
+ .remove = __devexit_p(qla4xxx_remove_adapter),
.err_handler = &qla4xxx_err_handler,
};
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists