From 2a123cbf69f8e6628a35fd357aa411d555a04600 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Mon, 7 Apr 2008 12:29:23 -0700 Subject: [PATCH] --- yaml --- r: 93045 b: refs/heads/master c: f1ebe4eba40e0ee862767893277d1b1a1e4cc85f h: refs/heads/master i: 93043: bfb56a5b61c4eca74f749e44f916b3f89fb225c1 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/omap_nor.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d744e670460d..ddcb9383d8c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70b072550a59e787b46030ab104ac64e25fcc732 +refs/heads/master: f1ebe4eba40e0ee862767893277d1b1a1e4cc85f diff --git a/trunk/drivers/mtd/maps/omap_nor.c b/trunk/drivers/mtd/maps/omap_nor.c index 676248ff4a75..240b0e2d095d 100644 --- a/trunk/drivers/mtd/maps/omap_nor.c +++ b/trunk/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 @@ static int __devinit omapflash_probe(struct platform_device *pdev) 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)