[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>
This commit is contained in:
committed by
David Woodhouse
parent
70b072550a
commit
f1ebe4eba4
@@ -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;
|
int err;
|
||||||
struct omapflash_info *info;
|
struct omapflash_info *info;
|
||||||
@@ -130,7 +130,7 @@ out_free_info:
|
|||||||
return err;
|
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);
|
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 = {
|
static struct platform_driver omapflash_driver = {
|
||||||
.probe = omapflash_probe,
|
.remove = __exit_p(omapflash_remove),
|
||||||
.remove = __devexit_p(omapflash_remove),
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "omapflash",
|
.name = "omapflash",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
@@ -162,7 +161,7 @@ static struct platform_driver omapflash_driver = {
|
|||||||
|
|
||||||
static int __init omapflash_init(void)
|
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)
|
static void __exit omapflash_exit(void)
|
||||||
|
Reference in New Issue
Block a user