From: Gabor Juhos Date: Mon, 25 Feb 2013 21:28:34 +0000 (+0000) Subject: ramips: remove __dev_{init,exit} annotations X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e1d6ce0775a2acb3832d064d7ac175d12abd01f;p=openwrt%2Fstaging%2Fnbd.git ramips: remove __dev_{init,exit} annotations Signed-off-by: Gabor Juhos SVN-Revision: 35798 --- diff --git a/target/linux/ramips/files/drivers/spi/spi-ramips.c b/target/linux/ramips/files/drivers/spi/spi-ramips.c index e6a2d8e561..d2ceaf3b8d 100644 --- a/target/linux/ramips/files/drivers/spi/spi-ramips.c +++ b/target/linux/ramips/files/drivers/spi/spi-ramips.c @@ -501,7 +501,7 @@ out_put_master: return status; } -static int __devexit ramips_spi_remove(struct platform_device *pdev) +static int ramips_spi_remove(struct platform_device *pdev) { struct spi_master *master; struct ramips_spi *rs; @@ -530,7 +530,7 @@ static struct platform_driver ramips_spi_driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, }, - .remove = __devexit_p(ramips_spi_remove), + .remove = ramips_spi_remove, }; static int __init ramips_spi_init(void) diff --git a/target/linux/ramips/files/drivers/watchdog/ramips_wdt.c b/target/linux/ramips/files/drivers/watchdog/ramips_wdt.c index 2350fab7c4..fa7e9e85ef 100644 --- a/target/linux/ramips/files/drivers/watchdog/ramips_wdt.c +++ b/target/linux/ramips/files/drivers/watchdog/ramips_wdt.c @@ -255,7 +255,7 @@ static struct miscdevice ramips_wdt_miscdev = { .fops = &ramips_wdt_fops, }; -static int __devinit ramips_wdt_probe(struct platform_device *pdev) +static int ramips_wdt_probe(struct platform_device *pdev) { struct resource *res; int err; @@ -313,7 +313,7 @@ err_unmap: return err; } -static int __devexit ramips_wdt_remove(struct platform_device *pdev) +static int ramips_wdt_remove(struct platform_device *pdev) { misc_deregister(&ramips_wdt_miscdev); clk_disable(ramips_wdt_clk); @@ -328,7 +328,7 @@ static void ramips_wdt_shutdown(struct platform_device *pdev) } static struct platform_driver ramips_wdt_driver = { - .remove = __devexit_p(ramips_wdt_remove), + .remove = ramips_wdt_remove, .shutdown = ramips_wdt_shutdown, .driver = { .name = DRIVER_NAME,