diff options
Diffstat (limited to 'drivers/staging/nvec')
-rw-r--r-- | drivers/staging/nvec/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec.c | 8 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_kbd.c | 6 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_paz00.c | 6 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_power.c | 6 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_ps2.c | 6 |
6 files changed, 17 insertions, 16 deletions
diff --git a/drivers/staging/nvec/Kconfig b/drivers/staging/nvec/Kconfig index 1235a78..f779fdc 100644 --- a/drivers/staging/nvec/Kconfig +++ b/drivers/staging/nvec/Kconfig @@ -1,6 +1,7 @@ config MFD_NVEC bool "NV Tegra Embedded Controller SMBus Interface" depends on I2C && GPIOLIB && ARCH_TEGRA + select MFD_CORE help Say Y here to enable support for a nVidia compliant embedded controller. diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 094fdc3..c59b7b2 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -716,7 +716,7 @@ static void nvec_power_off(void) nvec_write_async(nvec_power_handle, "\x04\x01", 2); } -static int __devinit tegra_nvec_probe(struct platform_device *pdev) +static int tegra_nvec_probe(struct platform_device *pdev) { int err, ret; struct clk *i2c_clk; @@ -853,7 +853,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) return 0; } -static int __devexit tegra_nvec_remove(struct platform_device *pdev) +static int tegra_nvec_remove(struct platform_device *pdev) { struct nvec_chip *nvec = platform_get_drvdata(pdev); @@ -901,7 +901,7 @@ static int nvec_resume(struct device *dev) static const SIMPLE_DEV_PM_OPS(nvec_pm_ops, nvec_suspend, nvec_resume); /* Match table for of_platform binding */ -static const struct of_device_id nvidia_nvec_of_match[] __devinitconst = { +static const struct of_device_id nvidia_nvec_of_match[] = { { .compatible = "nvidia,nvec", }, {}, }; @@ -909,7 +909,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match); static struct platform_driver nvec_device_driver = { .probe = tegra_nvec_probe, - .remove = __devexit_p(tegra_nvec_remove), + .remove = tegra_nvec_remove, .driver = { .name = "nvec", .owner = THIS_MODULE, diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index 6cc30dc..7cb149b 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c @@ -100,7 +100,7 @@ static int nvec_kbd_event(struct input_dev *dev, unsigned int type, return 0; } -static int __devinit nvec_kbd_probe(struct platform_device *pdev) +static int nvec_kbd_probe(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); int i, j, err; @@ -159,7 +159,7 @@ fail: return err; } -static int __devexit nvec_kbd_remove(struct platform_device *pdev) +static int nvec_kbd_remove(struct platform_device *pdev) { input_unregister_device(keys_dev.input); input_free_device(keys_dev.input); @@ -169,7 +169,7 @@ static int __devexit nvec_kbd_remove(struct platform_device *pdev) static struct platform_driver nvec_kbd_driver = { .probe = nvec_kbd_probe, - .remove = __devexit_p(nvec_kbd_remove), + .remove = nvec_kbd_remove, .driver = { .name = "nvec-kbd", .owner = THIS_MODULE, diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c index b747e39..934b796 100644 --- a/drivers/staging/nvec/nvec_paz00.c +++ b/drivers/staging/nvec/nvec_paz00.c @@ -43,7 +43,7 @@ static void nvec_led_brightness_set(struct led_classdev *led_cdev, } -static int __devinit nvec_paz00_probe(struct platform_device *pdev) +static int nvec_paz00_probe(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); struct nvec_led *led; @@ -72,7 +72,7 @@ static int __devinit nvec_paz00_probe(struct platform_device *pdev) return 0; } -static int __devexit nvec_paz00_remove(struct platform_device *pdev) +static int nvec_paz00_remove(struct platform_device *pdev) { struct nvec_led *led = platform_get_drvdata(pdev); @@ -83,7 +83,7 @@ static int __devexit nvec_paz00_remove(struct platform_device *pdev) static struct platform_driver nvec_paz00_driver = { .probe = nvec_paz00_probe, - .remove = __devexit_p(nvec_paz00_remove), + .remove = nvec_paz00_remove, .driver = { .name = "nvec-paz00", .owner = THIS_MODULE, diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c index cc8ccd7..b7b6d54 100644 --- a/drivers/staging/nvec/nvec_power.c +++ b/drivers/staging/nvec/nvec_power.c @@ -368,7 +368,7 @@ static void nvec_power_poll(struct work_struct *work) schedule_delayed_work(to_delayed_work(work), msecs_to_jiffies(5000)); }; -static int __devinit nvec_power_probe(struct platform_device *pdev) +static int nvec_power_probe(struct platform_device *pdev) { struct power_supply *psy; struct nvec_power *power; @@ -407,7 +407,7 @@ static int __devinit nvec_power_probe(struct platform_device *pdev) return power_supply_register(&pdev->dev, psy); } -static int __devexit nvec_power_remove(struct platform_device *pdev) +static int nvec_power_remove(struct platform_device *pdev) { struct nvec_power *power = platform_get_drvdata(pdev); @@ -425,7 +425,7 @@ static int __devexit nvec_power_remove(struct platform_device *pdev) static struct platform_driver nvec_power_driver = { .probe = nvec_power_probe, - .remove = __devexit_p(nvec_power_remove), + .remove = nvec_power_remove, .driver = { .name = "nvec-power", .owner = THIS_MODULE, diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index d7c6511..88dd288 100644 --- a/drivers/staging/nvec/nvec_ps2.c +++ b/drivers/staging/nvec/nvec_ps2.c @@ -93,7 +93,7 @@ static int nvec_ps2_notifier(struct notifier_block *nb, return NOTIFY_DONE; } -static int __devinit nvec_mouse_probe(struct platform_device *pdev) +static int nvec_mouse_probe(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); struct serio *ser_dev; @@ -123,7 +123,7 @@ static int __devinit nvec_mouse_probe(struct platform_device *pdev) return 0; } -static int __devexit nvec_mouse_remove(struct platform_device *pdev) +static int nvec_mouse_remove(struct platform_device *pdev) { serio_unregister_port(ps2_dev.ser_dev); @@ -164,7 +164,7 @@ static const SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend, static struct platform_driver nvec_mouse_driver = { .probe = nvec_mouse_probe, - .remove = __devexit_p(nvec_mouse_remove), + .remove = nvec_mouse_remove, .driver = { .name = "nvec-mouse", .owner = THIS_MODULE, |