diff options
| author |   Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:22:07 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 14:23:51 -0800 |
| commit | 46620803c309d2bc10814b903b39d7647057b440 (patch) | |
| tree | 850cc8c3bf947ce43770a9d40008e6522b74dd26 /drivers/staging/nvec | |
| parent | staging: nvec: remove use of __devexit_p (diff) | |
| download | linux-dev-46620803c309d2bc10814b903b39d7647057b440.tar.xz linux-dev-46620803c309d2bc10814b903b39d7647057b440.zip | |
staging: nvec: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Julian Andres Klode <jak@jak-linux.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/nvec')
| -rw-r--r-- | drivers/staging/nvec/nvec.c | 2 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec_kbd.c | 2 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec_paz00.c | 2 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec_power.c | 2 | ||||
| -rw-r--r-- | drivers/staging/nvec/nvec_ps2.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 0258035b4b0e..27881a352340 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; diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index 7c8c603da705..9048d597cc6b 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; diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c index aab234e97d0b..4ac17fb6a0dc 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; diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c index 99e06f661c19..6c702ed7463d 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; diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index 6375e80e77af..59d8f5a76360 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; |