diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
index 8aa7331d43be94b14d9e2e12606caaf6d9b4f425..ca007779ec5b95476d18d581ef3bd5672935ed27 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
@@ -151,7 +151,7 @@ static struct i2c_board_info nbg460n_i2c_devs[] __initdata = {
},
};
-static void __devinit nbg460n_i2c_init(void)
+static void nbg460n_i2c_init(void)
{
/* The gpio interface */
platform_device_register(&nbg460n_i2c_device);
diff --git a/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c b/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
index a5fec5ca7d1cffc1e6f31efbc1e27d6fc71772e2..5bdeb3d557c7af4c1261a50b62acf24d961955ea 100644
--- a/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
+++ b/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
@@ -74,7 +74,7 @@ static void nxp_74hc153_set_value(struct gpio_chip *gc,
/* not supported */
}
-static int __devinit nxp_74hc153_probe(struct platform_device *pdev)
+static int nxp_74hc153_probe(struct platform_device *pdev)
{
struct nxp_74hc153_platform_data *pdata;
struct nxp_74hc153_chip *nxp;
@@ -222,7 +222,7 @@ static int nxp_74hc153_remove(struct platform_device *pdev)
static struct platform_driver nxp_74hc153_driver = {
.probe = nxp_74hc153_probe,
- .remove = __devexit_p(nxp_74hc153_remove),
+ .remove = nxp_74hc153_remove,
.driver = {
.name = NXP_74HC153_DRIVER_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
index 483e4fc96767e843afaa6019cfd4dc8f8042b4a2..79e98b488233da0d3f737d762ecc067021f13865 100644
--- a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
+++ b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
@@ -52,7 +52,7 @@ static void rb750_led_brightness_set(struct led_classdev *led_cdev,
rbled->latch_change(rbled->mask, 0);
}
-static int __devinit rb750_led_probe(struct platform_device *pdev)
+static int rb750_led_probe(struct platform_device *pdev)
{
struct rb750_led_platform_data *pdata;
struct rb750_led_drvdata *drvdata;
@@ -101,7 +101,7 @@ err:
return ret;
}
-static int __devexit rb750_led_remove(struct platform_device *pdev)
+static int rb750_led_remove(struct platform_device *pdev)
{
struct rb750_led_drvdata *drvdata;
int i;
@@ -116,7 +116,7 @@ static int __devexit rb750_led_remove(struct platform_device *pdev)
static struct platform_driver rb750_led_driver = {
.probe = rb750_led_probe,
- .remove = __devexit_p(rb750_led_remove),
+ .remove = rb750_led_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
index 42f5b70bd88ac7956e8a8f22bef4840ad3322ce8..e6565dcdcd98c9467445a68444af4dcbd0cabcb6 100644
--- a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
+++ b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
@@ -37,12 +37,12 @@ static struct led_classdev wndr3700_usb_led = {
.brightness_get = wndr3700_usb_led_get,
};
-static int __devinit wndr3700_usb_led_probe(struct platform_device *pdev)
+static int wndr3700_usb_led_probe(struct platform_device *pdev)
{
return led_classdev_register(&pdev->dev, &wndr3700_usb_led);
}
-static int __devexit wndr3700_usb_led_remove(struct platform_device *pdev)
+static int wndr3700_usb_led_remove(struct platform_device *pdev)
{
led_classdev_unregister(&wndr3700_usb_led);
return 0;
@@ -50,7 +50,7 @@ static int __devexit wndr3700_usb_led_remove(struct platform_device *pdev)
static struct platform_driver wndr3700_usb_led_driver = {
.probe = wndr3700_usb_led_probe,
- .remove = __devexit_p(wndr3700_usb_led_remove),
+ .remove = wndr3700_usb_led_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
index 7939f9218ca58103e6db70d477e1b79be2e26428..e932491b922803fbdbb97e65992fb43c6ca41345 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
@@ -872,7 +872,7 @@ ar934x_nfc_irq_handler(int irq, void *data)
return IRQ_HANDLED;
}
-static int __devinit
+static int
ar934x_nfc_init_tail(struct mtd_info *mtd)
{
struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
@@ -998,7 +998,7 @@ ar934x_nfc_init_tail(struct mtd_info *mtd)
return err;
}
-static int __devinit
+static int
ar934x_nfc_probe(struct platform_device *pdev)
{
static const char *part_probes[] = { "cmdlinepart", NULL, };
@@ -1128,7 +1128,7 @@ err_free_nand:
return ret;
}
-static int __devexit
+static int
ar934x_nfc_remove(struct platform_device *pdev)
{
struct ar934x_nfc *nfc;
@@ -1147,7 +1147,7 @@ ar934x_nfc_remove(struct platform_device *pdev)
static struct platform_driver ar934x_nfc_driver = {
.probe = ar934x_nfc_probe,
- .remove = __devexit_p(ar934x_nfc_remove),
+ .remove = ar934x_nfc_remove,
.driver = {
.name = AR934X_NFC_DRIVER_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index a379900fe32baa095c08b1c7cfdb534498fc58fd..5b9841b76b5a41d5f166caaa93a150c0216e0597 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -136,7 +136,7 @@ static void rb4xx_nand_read_buf(struct mtd_info *mtd, unsigned char *buf,
pr_err("rb4xx_nand: read buf failed, err=%d\n", err);
}
-static int __devinit rb4xx_nand_probe(struct platform_device *pdev)
+static int rb4xx_nand_probe(struct platform_device *pdev)
{
struct rb4xx_nand_info *info;
int ret;
@@ -261,7 +261,7 @@ err:
return ret;
}
-static int __devexit rb4xx_nand_remove(struct platform_device *pdev)
+static int rb4xx_nand_remove(struct platform_device *pdev)
{
struct rb4xx_nand_info *info = platform_get_drvdata(pdev);
@@ -278,7 +278,7 @@ static int __devexit rb4xx_nand_remove(struct platform_device *pdev)
static struct platform_driver rb4xx_nand_driver = {
.probe = rb4xx_nand_probe,
- .remove = __devexit_p(rb4xx_nand_remove),
+ .remove = rb4xx_nand_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
index 94dedd8e44997a1a8c6bb7252f970befc984d07f..a20409b108abcc1a1e25c72668ff85f6ce048bd7 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -248,7 +248,7 @@ static void __init rb750_nand_gpio_init(struct rb750_nand_info *info)
info->pdata->latch_change(~out & RB750_NAND_IO0, out & RB750_NAND_IO0);
}
-static int __devinit rb750_nand_probe(struct platform_device *pdev)
+static int rb750_nand_probe(struct platform_device *pdev)
{
struct rb750_nand_info *info;
struct rb7xx_nand_platform_data *pdata;
@@ -315,7 +315,7 @@ err_free_info:
return ret;
}
-static int __devexit rb750_nand_remove(struct platform_device *pdev)
+static int rb750_nand_remove(struct platform_device *pdev)
{
struct rb750_nand_info *info = platform_get_drvdata(pdev);
@@ -328,7 +328,7 @@ static int __devexit rb750_nand_remove(struct platform_device *pdev)
static struct platform_driver rb750_nand_driver = {
.probe = rb750_nand_probe,
- .remove = __devexit_p(rb750_nand_remove),
+ .remove = rb750_nand_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
index 21140106cb2eecfd76f4c980527d270840633d37..9a51f786f98d5d79e90067fdee5cf28a61bc3805 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -1165,7 +1165,7 @@ void ag71xx_ar7240_stop(struct ag71xx *ag)
cancel_delayed_work_sync(&ag->link_work);
}
-int __devinit ag71xx_ar7240_init(struct ag71xx *ag)
+int ag71xx_ar7240_init(struct ag71xx *ag)
{
struct ar7240sw *as;
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index 2eeb2694393b0bcdfcee4ea820445a64a9a4b6d1..50029ffafefdf700759883ae8db7d6940808c281 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -1056,7 +1056,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
#endif
};
-static __devinit const char *ag71xx_get_phy_if_mode_name(phy_interface_t mode)
+static const char *ag71xx_get_phy_if_mode_name(phy_interface_t mode)
{
switch (mode) {
case PHY_INTERFACE_MODE_MII:
@@ -1077,7 +1077,7 @@ static __devinit const char *ag71xx_get_phy_if_mode_name(phy_interface_t mode)
}
-static int __devinit ag71xx_probe(struct platform_device *pdev)
+static int ag71xx_probe(struct platform_device *pdev)
{
struct net_device *dev;
struct resource *res;
@@ -1210,7 +1210,7 @@ err_out:
return err;
}
-static int __devexit ag71xx_remove(struct platform_device *pdev)
+static int ag71xx_remove(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
@@ -1231,7 +1231,7 @@ static int __devexit ag71xx_remove(struct platform_device *pdev)
static struct platform_driver ag71xx_driver = {
.probe = ag71xx_probe,
- .remove = __exit_p(ag71xx_remove),
+ .remove = ag71xx_remove,
.driver = {
.name = AG71XX_DRV_NAME,
}
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
index e123505c7a54099531ad74e13bded545b0332291..ec8823341e6607f4fcddbfddaf0206674c4dec38 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
@@ -205,7 +205,7 @@ static int ag71xx_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
return 0;
}
-static int __devinit ag71xx_mdio_probe(struct platform_device *pdev)
+static int ag71xx_mdio_probe(struct platform_device *pdev)
{
struct ag71xx_mdio_platform_data *pdata;
struct ag71xx_mdio *am;
@@ -281,7 +281,7 @@ err_out:
return err;
}
-static int __devexit ag71xx_mdio_remove(struct platform_device *pdev)
+static int ag71xx_mdio_remove(struct platform_device *pdev)
{
struct ag71xx_mdio *am = platform_get_drvdata(pdev);
@@ -298,7 +298,7 @@ static int __devexit ag71xx_mdio_remove(struct platform_device *pdev)
static struct platform_driver ag71xx_mdio_driver = {
.probe = ag71xx_mdio_probe,
- .remove = __exit_p(ag71xx_mdio_remove),
+ .remove = ag71xx_mdio_remove,
.driver = {
.name = "ag71xx-mdio",
}
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
index ce9edc1f743ea97f2de0f1db289a597844baf5bb..71f0b1d3cc51ded8f2d671bddf3e42c3b1d7882d 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
@@ -193,7 +193,7 @@ static struct mii_bus *dev_to_mii_bus(struct device *dev)
return NULL;
}
-int __devinit ag71xx_phy_connect(struct ag71xx *ag)
+int ag71xx_phy_connect(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
diff --git a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
index 4e8ce310500ab0f707a8bebef2cf55184ff1a554..a8d52825eba0d7540c0781d90e827262cf9632a6 100644
--- a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
@@ -356,7 +356,7 @@ static int rb4xx_cpld_gpio_init(struct rb4xx_cpld *cpld, unsigned int base)
return err;
}
-static int __devinit rb4xx_cpld_probe(struct spi_device *spi)
+static int rb4xx_cpld_probe(struct spi_device *spi)
{
struct rb4xx_cpld *cpld;
struct rb4xx_cpld_platform_data *pdata;
@@ -401,7 +401,7 @@ err_drvdata:
return err;
}
-static int __devexit rb4xx_cpld_remove(struct spi_device *spi)
+static int rb4xx_cpld_remove(struct spi_device *spi)
{
struct rb4xx_cpld *cpld;
@@ -420,7 +420,7 @@ static struct spi_driver rb4xx_cpld_driver = {
.owner = THIS_MODULE,
},
.probe = rb4xx_cpld_probe,
- .remove = __devexit_p(rb4xx_cpld_remove),
+ .remove = rb4xx_cpld_remove,
};
static int __init rb4xx_cpld_init(void)
diff --git a/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c b/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
index 9340df268b4dd217d6ece3c80ec01d6e49f10dff..b712e71875b9e654b6805a00574852f9b9993c9c 100644
--- a/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
@@ -526,7 +526,7 @@ static int vsc7385_detect(struct vsc7385 *vsc)
return 0;
}
-static int __devinit vsc7385_probe(struct spi_device *spi)
+static int vsc7385_probe(struct spi_device *spi)
{
struct vsc7385 *vsc;
struct vsc7385_platform_data *pdata;
@@ -581,7 +581,7 @@ err_drvdata:
return err;
}
-static int __devexit vsc7385_remove(struct spi_device *spi)
+static int vsc7385_remove(struct spi_device *spi)
{
struct vsc7385_data *vsc;
@@ -599,7 +599,7 @@ static struct spi_driver vsc7385_driver = {
.owner = THIS_MODULE,
},
.probe = vsc7385_probe,
- .remove = __devexit_p(vsc7385_remove),
+ .remove = vsc7385_remove,
};
static int __init vsc7385_init(void)