From: mathieu.poirier@linaro.org
To: JBottomley@parallels.com
Cc: megaraidlinux@lsi.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org, arnd@arndb.de,
mathieu.poirier@linaro.org
Subject: [PATCH 3/7] drivers/scsi: use correct __devexit_p annotation
Date: Fri, 11 May 2012 16:09:24 -0600 [thread overview]
Message-ID: <1336774168-26577-4-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1336774168-26577-1-git-send-email-mathieu.poirier@linaro.org>
From: Arnd Bergmann <arnd@arndb.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@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.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 ee47820..ff7c26f 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -5982,7 +5982,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
next prev parent reply other threads:[~2012-05-11 22:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 22:09 [PATCH 0/7] drivers/scsi: randconfig patches for kernel 3.4.patch mathieu.poirier
2012-05-11 22:09 ` [PATCH 1/7] scsi: mark SCSI_SRP as experimental mathieu.poirier
2012-05-11 22:09 ` [PATCH 2/7] scsi/nsp32: don't pass large values into udelay mathieu.poirier
2012-05-11 22:09 ` mathieu.poirier [this message]
2012-05-11 22:09 ` [PATCH 4/7] scsi/advansys: do not build on ARM mathieu.poirier
2012-05-11 22:09 ` [PATCH 5/7] scsi/atp870u: use mdelay instead of large udelay mathieu.poirier
2012-05-11 22:09 ` [PATCH 6/7] scsi/megaraid: fix sparse warnings mathieu.poirier
2012-05-11 22:29 ` adam radford
2012-05-12 13:02 ` Arnd Bergmann
2012-05-11 22:09 ` [PATCH 7/7] drivers/scsi: some ISA drivers need ISA_DMA_API mathieu.poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336774168-26577-4-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=JBottomley@parallels.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=megaraidlinux@lsi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®