From 91ba1524d4179b776ff3ae90c22a37eb26827833 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 27 Jan 2013 17:48:48 +0000 Subject: kernel: remove __devinit, __devexit and __devexit_p for kernel 3.8 These attributes where removed with kernel 3.8 and are now causing compile errors. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35328 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/files/drivers/input/misc/gpio_buttons.c | 6 +++--- target/linux/generic/files/drivers/net/phy/b53/b53_spi.c | 6 +++--- target/linux/generic/files/drivers/net/phy/rtl8366rb.c | 6 +++--- target/linux/generic/files/drivers/net/phy/rtl8366s.c | 6 +++--- target/linux/generic/files/drivers/net/phy/rtl8367.c | 6 +++--- target/linux/generic/files/drivers/net/phy/rtl8367b.c | 8 ++++---- target/linux/generic/files/drivers/pwm/gpio-pwm.c | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'target/linux/generic/files/drivers') diff --git a/target/linux/generic/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic/files/drivers/input/misc/gpio_buttons.c index 51288a3f9..af5491434 100644 --- a/target/linux/generic/files/drivers/input/misc/gpio_buttons.c +++ b/target/linux/generic/files/drivers/input/misc/gpio_buttons.c @@ -82,7 +82,7 @@ static void gpio_buttons_poll(struct input_polled_dev *dev) } } -static int __devinit gpio_buttons_probe(struct platform_device *pdev) +static int gpio_buttons_probe(struct platform_device *pdev) { struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; @@ -186,7 +186,7 @@ err_free_bdev: return error; } -static int __devexit gpio_buttons_remove(struct platform_device *pdev) +static int gpio_buttons_remove(struct platform_device *pdev) { struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev); struct gpio_buttons_platform_data *pdata = bdev->pdata; @@ -207,7 +207,7 @@ static int __devexit gpio_buttons_remove(struct platform_device *pdev) static struct platform_driver gpio_buttons_driver = { .probe = gpio_buttons_probe, - .remove = __devexit_p(gpio_buttons_remove), + .remove = gpio_buttons_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c index 9c70d1f04..6050fea32 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c @@ -278,7 +278,7 @@ static struct b53_io_ops b53_spi_ops = { .write64 = b53_spi_write64, }; -static int __devinit b53_spi_probe(struct spi_device *spi) +static int b53_spi_probe(struct spi_device *spi) { struct b53_device *dev; int ret; @@ -299,7 +299,7 @@ static int __devinit b53_spi_probe(struct spi_device *spi) return 0; } -static int __devexit b53_spi_remove(struct spi_device *spi) +static int b53_spi_remove(struct spi_device *spi) { struct b53_device *dev = spi->dev.platform_data; @@ -319,7 +319,7 @@ static struct spi_driver b53_spi_driver = { .owner = THIS_MODULE, }, .probe = b53_spi_probe, - .remove = __devexit_p(b53_spi_remove), + .remove = b53_spi_remove, }; module_spi_driver(b53_spi_driver); diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index ee61a56c6..d3674afcb 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -1170,7 +1170,7 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { .enable_port = rtl8366rb_enable_port, }; -static int __devinit rtl8366rb_probe(struct platform_device *pdev) +static int rtl8366rb_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; struct rtl8366_smi *smi; @@ -1214,7 +1214,7 @@ static int __devinit rtl8366rb_probe(struct platform_device *pdev) return err; } -static int __devexit rtl8366rb_remove(struct platform_device *pdev) +static int rtl8366rb_remove(struct platform_device *pdev) { struct rtl8366_smi *smi = platform_get_drvdata(pdev); @@ -1243,7 +1243,7 @@ static struct platform_driver rtl8366rb_driver = { .of_match_table = of_match_ptr(rtl8366rb_match), }, .probe = rtl8366rb_probe, - .remove = __devexit_p(rtl8366rb_remove), + .remove = rtl8366rb_remove, }; static int __init rtl8366rb_module_init(void) diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 7d0de7c6a..196d49e4c 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -1050,7 +1050,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = { .enable_port = rtl8366s_enable_port, }; -static int __devinit rtl8366s_probe(struct platform_device *pdev) +static int rtl8366s_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; struct rtl8366_smi *smi; @@ -1094,7 +1094,7 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev) return err; } -static int __devexit rtl8366s_remove(struct platform_device *pdev) +static int rtl8366s_remove(struct platform_device *pdev) { struct rtl8366_smi *smi = platform_get_drvdata(pdev); @@ -1125,7 +1125,7 @@ static struct platform_driver rtl8366s_driver = { #endif }, .probe = rtl8366s_probe, - .remove = __devexit_p(rtl8366s_remove), + .remove = rtl8366s_remove, }; static int __init rtl8366s_module_init(void) diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367.c b/target/linux/generic/files/drivers/net/phy/rtl8367.c index b225e6750..cd58bbb8f 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8367.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8367.c @@ -1673,7 +1673,7 @@ static struct rtl8366_smi_ops rtl8367_smi_ops = { .enable_port = rtl8367_enable_port, }; -static int __devinit rtl8367_probe(struct platform_device *pdev) +static int rtl8367_probe(struct platform_device *pdev) { struct rtl8366_smi *smi; int err; @@ -1712,7 +1712,7 @@ static int __devinit rtl8367_probe(struct platform_device *pdev) return err; } -static int __devexit rtl8367_remove(struct platform_device *pdev) +static int rtl8367_remove(struct platform_device *pdev) { struct rtl8366_smi *smi = platform_get_drvdata(pdev); @@ -1751,7 +1751,7 @@ static struct platform_driver rtl8367_driver = { #endif }, .probe = rtl8367_probe, - .remove = __devexit_p(rtl8367_remove), + .remove = rtl8367_remove, .shutdown = rtl8367_shutdown, }; diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/target/linux/generic/files/drivers/net/phy/rtl8367b.c index 8d43c3e24..c70a14486 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c @@ -1382,7 +1382,7 @@ static int rtl8367b_mii_write(struct mii_bus *bus, int addr, int reg, u16 val) return err; } -static int __devinit rtl8367b_detect(struct rtl8366_smi *smi) +static int rtl8367b_detect(struct rtl8366_smi *smi) { const char *chip_name; u32 chip_num; @@ -1455,7 +1455,7 @@ static struct rtl8366_smi_ops rtl8367b_smi_ops = { .enable_port = rtl8367b_enable_port, }; -static int __devinit rtl8367b_probe(struct platform_device *pdev) +static int rtl8367b_probe(struct platform_device *pdev) { struct rtl8366_smi *smi; int err; @@ -1494,7 +1494,7 @@ static int __devinit rtl8367b_probe(struct platform_device *pdev) return err; } -static int __devexit rtl8367b_remove(struct platform_device *pdev) +static int rtl8367b_remove(struct platform_device *pdev) { struct rtl8366_smi *smi = platform_get_drvdata(pdev); @@ -1533,7 +1533,7 @@ static struct platform_driver rtl8367b_driver = { #endif }, .probe = rtl8367b_probe, - .remove = __devexit_p(rtl8367b_remove), + .remove = rtl8367b_remove, .shutdown = rtl8367b_shutdown, }; diff --git a/target/linux/generic/files/drivers/pwm/gpio-pwm.c b/target/linux/generic/files/drivers/pwm/gpio-pwm.c index dff5d1d62..58e518fe7 100644 --- a/target/linux/generic/files/drivers/pwm/gpio-pwm.c +++ b/target/linux/generic/files/drivers/pwm/gpio-pwm.c @@ -205,7 +205,7 @@ gpio_pwm_request(struct pwm_channel *p) return 0; } -static int __devinit +static int gpio_pwm_probe(struct platform_device *pdev) { struct gpio_pwm *gp; @@ -256,7 +256,7 @@ err_alloc: return ret; } -static int __devexit +static int gpio_pwm_remove(struct platform_device *pdev) { struct gpio_pwm *gp = platform_get_drvdata(pdev); @@ -277,7 +277,7 @@ static struct platform_driver gpio_pwm_driver = { .owner = THIS_MODULE, }, .probe = gpio_pwm_probe, - .remove = __devexit_p(gpio_pwm_remove), + .remove = gpio_pwm_remove, }; static int __init gpio_pwm_init(void) -- cgit v1.2.3