From: Venkatraman S <svenkatr@ti.com>
To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org
Cc: cjb@laptop.org, balajitk@ti.com, balbi@ti.com
Subject: [PATCH RESEND 6/8] mmc: host: omap_hsmmc: make it behave well as a module
Date: Thu, 15 Mar 2012 20:03:40 +0530 [thread overview]
Message-ID: <1331822022-26714-7-git-send-email-svenkatr@ti.com> (raw)
In-Reply-To: <1331822022-26714-1-git-send-email-svenkatr@ti.com>
From: Felipe Balbi <balbi@ti.com>
if we put probe() on __init section, that will never
work for multiple module insertions/removals.
In order to make it work properly, move probe to
__devinit section and use platform_driver_register()
instead of platform_driver_probe().
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/mmc/host/omap_hsmmc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6b30782..67cb63e 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1780,7 +1780,7 @@ static inline struct omap_mmc_platform_data
}
#endif
-static int __init omap_hsmmc_probe(struct platform_device *pdev)
+static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
{
struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
struct mmc_host *mmc;
@@ -2032,7 +2032,7 @@ err:
return ret;
}
-static int omap_hsmmc_remove(struct platform_device *pdev)
+static int __devexit omap_hsmmc_remove(struct platform_device *pdev)
{
struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
struct resource *res;
@@ -2190,7 +2190,8 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
};
static struct platform_driver omap_hsmmc_driver = {
- .remove = omap_hsmmc_remove,
+ .probe = omap_hsmmc_probe,
+ .remove = __devexit_p(omap_hsmmc_remove),
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
@@ -2202,7 +2203,7 @@ static struct platform_driver omap_hsmmc_driver = {
static int __init omap_hsmmc_init(void)
{
/* Register the MMC driver */
- return platform_driver_probe(&omap_hsmmc_driver, omap_hsmmc_probe);
+ return platform_driver_register(&omap_hsmmc_driver);
}
static void __exit omap_hsmmc_cleanup(void)
--
1.7.10.rc0.41.gfa678
next prev parent reply other threads:[~2012-03-15 14:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 14:33 [PATCH 0/8][git pull] mmc: omap: Assorted fixes for 3.4 merge window Venkatraman S
2012-03-15 14:33 ` [PATCH RESEND 1/8] mmc: omap: Enable Auto CMD12 Venkatraman S
2012-03-15 14:54 ` Felipe Balbi
2012-03-15 14:57 ` Felipe Balbi
2012-03-16 5:25 ` S, Venkatraman
2012-03-15 14:33 ` [PATCH RESEND 2/8] mmc: omap: add DDR support to omap_hsmmc Venkatraman S
2012-03-15 14:33 ` [PATCH RESEND 3/8] mmc: omap: use runtime put sync in probe error patch Venkatraman S
2012-03-15 14:58 ` Felipe Balbi
2012-03-15 14:33 ` [PATCH RESEND 4/8] mmc: omap: context save after enabling runtime pm Venkatraman S
2012-03-15 14:59 ` Felipe Balbi
2012-03-15 15:12 ` Shubhrajyoti
2012-03-16 13:32 ` T Krishnamoorthy, Balaji
2012-03-15 14:33 ` [PATCH RESEND 5/8] mmc: host: omap_hsmmc: trivial cleanups Venkatraman S
2012-03-15 14:33 ` Venkatraman S [this message]
2012-03-15 14:33 ` [PATCH RESEND 7/8] mmc: host: omap_hsmmc: convert to module_platform_driver Venkatraman S
2012-03-15 14:33 ` [PATCH RESEND 8/8] mmc: omap4: hsmmc: fix module re-insertion Venkatraman S
2012-03-15 15:04 ` Felipe Balbi
2012-03-16 10:32 ` S, Venkatraman
2012-03-16 10:38 ` Felipe Balbi
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=1331822022-26714-7-git-send-email-svenkatr@ti.com \
--to=svenkatr@ti.com \
--cc=balajitk@ti.com \
--cc=balbi@ti.com \
--cc=cjb@laptop.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/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).