diff options
| -rw-r--r-- | package/system/gpio-button-hotplug/src/gpio-button-hotplug.c | 12 | ||||
| -rw-r--r-- | package/system/spi-ks8995/src/spi_ks8995.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package/system/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/system/gpio-button-hotplug/src/gpio-button-hotplug.c index f667a327f..9d91b57b5 100644 --- a/package/system/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/system/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -308,7 +308,7 @@ static void gpio_keys_polled_poll(struct work_struct *work) gpio_keys_polled_queue_work(bdev); } -static void __devinit gpio_keys_polled_open(struct gpio_keys_polled_dev *bdev) +static void gpio_keys_polled_open(struct gpio_keys_polled_dev *bdev) { struct gpio_keys_platform_data *pdata = bdev->pdata; int i; @@ -324,7 +324,7 @@ static void __devinit gpio_keys_polled_open(struct gpio_keys_polled_dev *bdev) } #ifdef CONFIG_OF -static struct gpio_keys_platform_data * __devinit +static struct gpio_keys_platform_data * gpio_keys_polled_get_devtree_pdata(struct device *dev) { struct device_node *node, *pp; @@ -417,7 +417,7 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev) } #endif -static void __devexit gpio_keys_polled_close(struct gpio_keys_polled_dev *bdev) +static void gpio_keys_polled_close(struct gpio_keys_polled_dev *bdev) { struct gpio_keys_platform_data *pdata = bdev->pdata; @@ -427,7 +427,7 @@ static void __devexit gpio_keys_polled_close(struct gpio_keys_polled_dev *bdev) pdata->disable(bdev->dev); } -static int __devinit gpio_keys_polled_probe(struct platform_device *pdev) +static int gpio_keys_polled_probe(struct platform_device *pdev) { struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; @@ -517,7 +517,7 @@ err_free_pdata: return error; } -static int __devexit gpio_keys_polled_remove(struct platform_device *pdev) +static int gpio_keys_polled_remove(struct platform_device *pdev) { struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev); struct gpio_keys_platform_data *pdata = bdev->pdata; @@ -536,7 +536,7 @@ static int __devexit gpio_keys_polled_remove(struct platform_device *pdev) static struct platform_driver gpio_keys_polled_driver = { .probe = gpio_keys_polled_probe, - .remove = __devexit_p(gpio_keys_polled_remove), + .remove = gpio_keys_polled_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, diff --git a/package/system/spi-ks8995/src/spi_ks8995.c b/package/system/spi-ks8995/src/spi_ks8995.c index c0dd86b4c..dc42b5d31 100644 --- a/package/system/spi-ks8995/src/spi_ks8995.c +++ b/package/system/spi-ks8995/src/spi_ks8995.c @@ -305,7 +305,7 @@ static struct bin_attribute ks8995_registers_attr = { /*-------------------------------------------------------------------------*/ -static int __devinit ks8995_probe(struct spi_device *spi) +static int ks8995_probe(struct spi_device *spi) { struct ks8995_switch *ks; struct ks8995_pdata *pdata; @@ -373,7 +373,7 @@ err_drvdata: return err; } -static int __devexit ks8995_remove(struct spi_device *spi) +static int ks8995_remove(struct spi_device *spi) { struct ks8995_data *ks8995; @@ -395,7 +395,7 @@ static struct spi_driver ks8995_driver = { .owner = THIS_MODULE, }, .probe = ks8995_probe, - .remove = __devexit_p(ks8995_remove), + .remove = ks8995_remove, }; static int __init ks8995_init(void) |