Skip to content

Commit

Permalink
mmc: omap: make it behave well as a module
Browse files Browse the repository at this point in the history
Use proper __devinit and __devexit annotation for driver functions.
Instantiate the probe function for driver_ops instead of a probe in
the register function.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Acked-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Venkatraman S authored and Chris Ball committed May 17, 2012
1 parent b01a4f1 commit b6e0703
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/mmc/host/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ static void mmc_omap_remove_slot(struct mmc_omap_slot *slot)
mmc_free_host(mmc);
}

static int __init mmc_omap_probe(struct platform_device *pdev)
static int __devinit mmc_omap_probe(struct platform_device *pdev)
{
struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
struct mmc_omap_host *host = NULL;
Expand Down Expand Up @@ -1522,7 +1522,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
return ret;
}

static int mmc_omap_remove(struct platform_device *pdev)
static int __devexit mmc_omap_remove(struct platform_device *pdev)
{
struct mmc_omap_host *host = platform_get_drvdata(pdev);
int i;
Expand Down Expand Up @@ -1604,7 +1604,8 @@ static int mmc_omap_resume(struct platform_device *pdev)
#endif

static struct platform_driver mmc_omap_driver = {
.remove = mmc_omap_remove,
.probe = mmc_omap_probe,
.remove = __devexit_p(mmc_omap_remove),
.suspend = mmc_omap_suspend,
.resume = mmc_omap_resume,
.driver = {
Expand All @@ -1615,7 +1616,7 @@ static struct platform_driver mmc_omap_driver = {

static int __init mmc_omap_init(void)
{
return platform_driver_probe(&mmc_omap_driver, mmc_omap_probe);
return platform_driver_register(&mmc_omap_driver);
}

static void __exit mmc_omap_exit(void)
Expand Down

0 comments on commit b6e0703

Please sign in to comment.