diff options
12 files changed, 39 insertions, 39 deletions
diff --git a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c index 1b4333cdde..7bb62bc531 100644 --- a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c +++ b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c @@ -38,7 +38,7 @@ #define TIMER_INTERVAL 1000 -static void __devexit pasemi_dma_remove(struct pci_dev *pdev); +static void pasemi_dma_remove(struct pci_dev *pdev); static struct pasdma_status volatile * dma_status; static int debug; @@ -790,7 +790,7 @@ static device_method_t pasemi_methods = { /* Set up the crypto device structure, private data, * and anything else we need before we start */ -static int __devinit +static int pasemi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct pasemi_softc *sc; @@ -943,7 +943,7 @@ static void pasemi_free_tx_resources(struct pasemi_softc *sc, int chan) del_timer(&ring->crypto_timer); } -static void __devexit pasemi_dma_remove(struct pci_dev *pdev) +static void pasemi_dma_remove(struct pci_dev *pdev) { struct pasemi_softc *sc = pci_get_drvdata(pdev); int i; @@ -984,7 +984,7 @@ static struct pci_driver pasemi_dma_driver = { .name = "pasemi_dma", .id_table = pasemi_dma_pci_tbl, .probe = pasemi_dma_probe, - .remove = __devexit_p(pasemi_dma_remove), + .remove = pasemi_dma_remove, }; static void __exit pasemi_dma_cleanup_module(void) diff --git a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c index f5d7762360..3f3f5135cd 100644 --- a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c +++ b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c @@ -104,9 +104,9 @@ * Prototypes */ static irqreturn_t ubsec_ssb_isr(int, void *, struct pt_regs *); -static int __devinit ubsec_ssb_probe(struct ssb_device *sdev, +static int ubsec_ssb_probe(struct ssb_device *sdev, const struct ssb_device_id *ent); -static void __devexit ubsec_ssb_remove(struct ssb_device *sdev); +static void ubsec_ssb_remove(struct ssb_device *sdev); int ubsec_attach(struct ssb_device *sdev, const struct ssb_device_id *ent, struct device *self); static void ubsec_setup_mackey(struct ubsec_session *ses, int algo, @@ -185,7 +185,7 @@ static struct ssb_driver ubsec_ssb_driver = { .name = DRV_MODULE_NAME, .id_table = ubsec_ssb_tbl, .probe = ubsec_ssb_probe, - .remove = __devexit_p(ubsec_ssb_remove), + .remove = ubsec_ssb_remove, /* .suspend = ubsec_ssb_suspend, .resume = ubsec_ssb_resume @@ -482,8 +482,8 @@ ubsec_setup_mackey(struct ubsec_session *ses, int algo, caddr_t key, int klen) } #undef N -static int -__devinit ubsec_ssb_probe(struct ssb_device *sdev, +static int +ubsec_ssb_probe(struct ssb_device *sdev, const struct ssb_device_id *ent) { int err; @@ -553,7 +553,7 @@ err_out: return err; } -static void __devexit ubsec_ssb_remove(struct ssb_device *sdev) { +static void ubsec_ssb_remove(struct ssb_device *sdev) { struct ubsec_softc *sc; unsigned int ctrlflgs; 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 51288a3f93..af54914342 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 9c70d1f043..6050fea32e 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 ee61a56c6a..d3674afcb9 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 7d0de7c6a1..196d49e4c6 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 b225e6750c..cd58bbb8f9 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 8d43c3e240..c70a14486f 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 dff5d1d627..58e518fe7d 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) diff --git a/target/linux/generic/patches-3.8/840-rtc7301.patch b/target/linux/generic/patches-3.8/840-rtc7301.patch index 89b5d46fc9..ad837eb971 100644 --- a/target/linux/generic/patches-3.8/840-rtc7301.patch +++ b/target/linux/generic/patches-3.8/840-rtc7301.patch @@ -185,7 +185,7 @@ + .set_time = rtc7301_set_datetime, +}; + -+static int __devinit rtc7301_probe(struct platform_device *pdev) ++static int rtc7301_probe(struct platform_device *pdev) +{ + struct rtc_device *rtc; + struct resource *res; @@ -211,7 +211,7 @@ + return 0; +} + -+static int __devexit rtc7301_remove(struct platform_device *pdev) ++static int rtc7301_remove(struct platform_device *pdev) +{ + struct rtc_device *rtc = platform_get_drvdata(pdev); + @@ -228,7 +228,7 @@ + .owner = THIS_MODULE, + }, + .probe = rtc7301_probe, -+ .remove = __devexit_p(rtc7301_remove), ++ .remove = rtc7301_remove, +}; + +static __init int rtc7301_init(void) diff --git a/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch index 564e506017..7d763146fc 100644 --- a/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch +++ b/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch @@ -209,7 +209,7 @@ + return ret; +} + -+static int __devexit pt7c4338_remove(struct i2c_client *client) ++static int pt7c4338_remove(struct i2c_client *client) +{ + struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client); + @@ -225,7 +225,7 @@ + .owner = THIS_MODULE, + }, + .probe = pt7c4338_probe, -+ .remove = __devexit_p(pt7c4338_remove), ++ .remove = pt7c4338_remove, + .id_table = pt7c4338_id, +}; + diff --git a/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch b/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch index 86ae86df82..e68f808c3f 100644 --- a/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch +++ b/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch @@ -286,7 +286,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29. + return err; +} + -+static int __devexit spi_gpio_remove(struct platform_device *pdev) ++static int spi_gpio_remove(struct platform_device *pdev) +{ + struct spi_gpio *sp; + struct spi_gpio_platform_data *pdata; @@ -310,7 +310,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29. + .owner = THIS_MODULE, + }, + .probe = spi_gpio_probe, -+ .remove = __devexit_p(spi_gpio_remove), ++ .remove = spi_gpio_remove, +}; + +int spi_gpio_next_id(void) |