diff options
| author | David Brownell <david-b@pacbell.net> | 2008-04-07 12:29:23 -0700 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 21:24:00 +0100 |
| commit | f1ebe4eba40e0ee862767893277d1b1a1e4cc85f (patch) | |
| tree | aa36c97405dbd3660d1735ae655b7b3eb2a09737 /drivers | |
| parent | 70b072550a59e787b46030ab104ac64e25fcc732 (diff) | |
| download | blackbird-op-linux-f1ebe4eba40e0ee862767893277d1b1a1e4cc85f.tar.gz blackbird-op-linux-f1ebe4eba40e0ee862767893277d1b1a1e4cc85f.zip | |
[MTD] [MAPS] omap_nor section fixes
Minor tweaks to omap_nor ... as with most platform drivers, its probe
and remove logic can (and should!) safely vanish in most configs.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/maps/omap_nor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index 676248ff4a75..240b0e2d095d 100644 --- a/drivers/mtd/maps/omap_nor.c +++ b/drivers/mtd/maps/omap_nor.c @@ -70,7 +70,7 @@ static void omap_set_vpp(struct map_info *map, int enable) } } -static int __devinit omapflash_probe(struct platform_device *pdev) +static int __init omapflash_probe(struct platform_device *pdev) { int err; struct omapflash_info *info; @@ -130,7 +130,7 @@ out_free_info: return err; } -static int __devexit omapflash_remove(struct platform_device *pdev) +static int __exit omapflash_remove(struct platform_device *pdev) { struct omapflash_info *info = platform_get_drvdata(pdev); @@ -152,8 +152,7 @@ static int __devexit omapflash_remove(struct platform_device *pdev) } static struct platform_driver omapflash_driver = { - .probe = omapflash_probe, - .remove = __devexit_p(omapflash_remove), + .remove = __exit_p(omapflash_remove), .driver = { .name = "omapflash", .owner = THIS_MODULE, @@ -162,7 +161,7 @@ static struct platform_driver omapflash_driver = { static int __init omapflash_init(void) { - return platform_driver_register(&omapflash_driver); + return platform_driver_probe(&omapflash_driver, omapflash_probe); } static void __exit omapflash_exit(void) |
