From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: "David S. Miller" <davem@davemloft.net>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
guohanjun@huawei.com, Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 2/5] scsi: sun: use module_platform_driver() and platform_{set,get}_drvdata
Date: Thu, 30 May 2013 20:09:43 +0800 [thread overview]
Message-ID: <1369915786-2660-3-git-send-email-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <1369915786-2660-1-git-send-email-wangkefeng.wang@huawei.com>
Use helper macro and wrapper functions to simpily code. Meanwhile,
remove unnecessary drvdata set to null due to commint 0998d0631
(device-core: Ensure drvdata = NULL when no driver is bound).
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/scsi/sun_esp.c | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index f2e6845..b7361a6 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -538,7 +538,7 @@ static int esp_sbus_probe_one(struct platform_device *op,
dma_write32(val & ~DMA_RST_SCSI, DMA_CSR);
}
- dev_set_drvdata(&op->dev, esp);
+ platform_set_drvdata(op, esp);
err = scsi_esp_register(esp, &op->dev);
if (err)
@@ -585,7 +585,7 @@ static int esp_sbus_probe(struct platform_device *op)
static int esp_sbus_remove(struct platform_device *op)
{
- struct esp *esp = dev_get_drvdata(&op->dev);
+ struct esp *esp = platform_get_drvdata(op);
struct platform_device *dma_of = esp->dma;
unsigned int irq = esp->host->irq;
bool is_hme;
@@ -611,8 +611,6 @@ static int esp_sbus_remove(struct platform_device *op)
scsi_host_put(esp->host);
- dev_set_drvdata(&op->dev, NULL);
-
return 0;
}
@@ -640,20 +638,9 @@ static struct platform_driver esp_sbus_driver = {
.remove = esp_sbus_remove,
};
-static int __init sunesp_init(void)
-{
- return platform_driver_register(&esp_sbus_driver);
-}
-
-static void __exit sunesp_exit(void)
-{
- platform_driver_unregister(&esp_sbus_driver);
-}
+module_platform_driver(esp_sbus_driver);
MODULE_DESCRIPTION("Sun ESP SCSI driver");
MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
-
-module_init(sunesp_init);
-module_exit(sunesp_exit);
--
1.8.2.1
next prev parent reply other threads:[~2013-05-30 12:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 12:09 [PATCH 0/5] scsi: use platform helper macro and wrapper functions Kefeng Wang
2013-05-30 12:09 ` [PATCH 1/5] scsi: jazz: use module_platform_driver() and platform_{set,get}_drvdata Kefeng Wang
2013-05-30 12:09 ` Kefeng Wang [this message]
2013-05-30 12:09 ` [PATCH 3/5] scsi: qlogicpti: " Kefeng Wang
2013-05-30 12:09 ` [PATCH 4/5] scsi: sun3x: " Kefeng Wang
2013-05-30 12:09 ` [PATCH 5/5] scsi: sni: " Kefeng Wang
2013-05-30 14:38 ` [PATCH 0/5] scsi: use platform helper macro and wrapper functions James Bottomley
2013-05-31 1:15 ` Kefeng Wang
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=1369915786-2660-3-git-send-email-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=davem@davemloft.net \
--cc=guohanjun@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/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;
as well as URLs for NNTP newsgroup(s).