dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Input: remove use of __devexit 

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Bill Pemberton 2012-11-23 21:50:47 -08:00 committed by Dmitry Torokhov
parent 5298cc4cc7
commit e2619cf78e
141 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/gameport/emu10k1-gp.c
View File

@ -107,7 +107,7 @@ static int emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return error;
}
static void __devexit emu_remove(struct pci_dev *pdev)
static void emu_remove(struct pci_dev *pdev)
{
struct emu *emu = pci_get_drvdata(pdev);

2
drivers/input/gameport/fm801-gp.c
View File

@ -129,7 +129,7 @@ static int fm801_gp_probe(struct pci_dev *pci, const struct pci_device_id *id)
return error;
}
static void __devexit fm801_gp_remove(struct pci_dev *pci)
static void fm801_gp_remove(struct pci_dev *pci)
{
struct fm801_gp *gp = pci_get_drvdata(pci);

2
drivers/input/joystick/as5011.c
View File

@ -341,7 +341,7 @@ err_free_mem:
return error;
}
static int __devexit as5011_remove(struct i2c_client *client)
static int as5011_remove(struct i2c_client *client)
{
struct as5011_device *as5011 = i2c_get_clientdata(client);

2
drivers/input/joystick/maplecontrol.c
View File

@ -157,7 +157,7 @@ fail:
return error;
}
static int __devexit remove_maple_controller(struct device *dev)
static int remove_maple_controller(struct device *dev)
{
struct maple_device *mdev = to_maple_dev(dev);
struct dc_pad *pad = maple_get_drvdata(mdev);

2
drivers/input/keyboard/adp5520-keys.c
View File

@ -182,7 +182,7 @@ err:
return ret;
}
static int __devexit adp5520_keys_remove(struct platform_device *pdev)
static int adp5520_keys_remove(struct platform_device *pdev)
{
struct adp5520_keys *dev = platform_get_drvdata(pdev);

4
drivers/input/keyboard/adp5588-keys.c
View File

@ -224,7 +224,7 @@ static int adp5588_gpio_add(struct adp5588_kpad *kpad)
return 0;
}
static void __devexit adp5588_gpio_remove(struct adp5588_kpad *kpad)
static void adp5588_gpio_remove(struct adp5588_kpad *kpad)
{
struct device *dev = &kpad->client->dev;
const struct adp5588_kpad_platform_data *pdata = dev->platform_data;
@ -587,7 +587,7 @@ static int adp5588_probe(struct i2c_client *client,
return error;
}
static int __devexit adp5588_remove(struct i2c_client *client)
static int adp5588_remove(struct i2c_client *client)
{
struct adp5588_kpad *kpad = i2c_get_clientdata(client);

4
drivers/input/keyboard/adp5589-keys.c
View File

@ -550,7 +550,7 @@ static int adp5589_gpio_add(struct adp5589_kpad *kpad)
return 0;
}
static void __devexit adp5589_gpio_remove(struct adp5589_kpad *kpad)
static void adp5589_gpio_remove(struct adp5589_kpad *kpad)
{
struct device *dev = &kpad->client->dev;
const struct adp5589_kpad_platform_data *pdata = dev->platform_data;
@ -1044,7 +1044,7 @@ err_free_mem:
return error;
}
static int __devexit adp5589_remove(struct i2c_client *client)
static int adp5589_remove(struct i2c_client *client)
{
struct adp5589_kpad *kpad = i2c_get_clientdata(client);

2
drivers/input/keyboard/bf54x-keys.c
View File

@ -331,7 +331,7 @@ out:
return error;
}
static int __devexit bfin_kpad_remove(struct platform_device *pdev)
static int bfin_kpad_remove(struct platform_device *pdev)
{
struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data;
struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);

2
drivers/input/keyboard/davinci_keyscan.c
View File

@ -303,7 +303,7 @@ fail1:
return error;
}
static int __devexit davinci_ks_remove(struct platform_device *pdev)
static int davinci_ks_remove(struct platform_device *pdev)
{
struct davinci_ks *davinci_ks = platform_get_drvdata(pdev);

2
drivers/input/keyboard/ep93xx_keypad.c
View File

@ -346,7 +346,7 @@ failed_free:
return err;
}
static int __devexit ep93xx_keypad_remove(struct platform_device *pdev)
static int ep93xx_keypad_remove(struct platform_device *pdev)
{
struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/keyboard/gpio_keys.c
View File

@ -760,7 +760,7 @@ static int gpio_keys_probe(struct platform_device *pdev)
return error;
}
static int __devexit gpio_keys_remove(struct platform_device *pdev)
static int gpio_keys_remove(struct platform_device *pdev)
{
struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);
struct input_dev *input = ddata->input;

2
drivers/input/keyboard/gpio_keys_polled.c
View File

@ -328,7 +328,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);
const struct gpio_keys_platform_data *pdata = bdev->pdata;

4
drivers/input/keyboard/hilkbd.c
View File

@ -286,7 +286,7 @@ err1:
return err;
}
static void __devexit hil_keyb_exit(void)
static void hil_keyb_exit(void)
{
if (HIL_IRQ)
free_irq(HIL_IRQ, hil_dev.dev_id);
@ -320,7 +320,7 @@ static int hil_probe_chip(struct parisc_device *dev)
return hil_keyb_init();
}
static int __devexit hil_remove_chip(struct parisc_device *dev)
static int hil_remove_chip(struct parisc_device *dev)
{
hil_keyb_exit();

2
drivers/input/keyboard/imx_keypad.c
View File

@ -554,7 +554,7 @@ failed_rel_mem:
return error;
}
static int __devexit imx_keypad_remove(struct platform_device *pdev)
static int imx_keypad_remove(struct platform_device *pdev)
{
struct imx_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/keyboard/jornada680_kbd.c
View File

@ -240,7 +240,7 @@ static int jornada680kbd_probe(struct platform_device *pdev)
}
static int __devexit jornada680kbd_remove(struct platform_device *pdev)
static int jornada680kbd_remove(struct platform_device *pdev)
{
struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);

2
drivers/input/keyboard/jornada720_kbd.c
View File

@ -152,7 +152,7 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
return err;
};
static int __devexit jornada720_kbd_remove(struct platform_device *pdev)
static int jornada720_kbd_remove(struct platform_device *pdev)
{
struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);

2
drivers/input/keyboard/lm8323.c
View File

@ -764,7 +764,7 @@ fail1:
return err;
}
static int __devexit lm8323_remove(struct i2c_client *client)
static int lm8323_remove(struct i2c_client *client)
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
int i;

2
drivers/input/keyboard/lm8333.c
View File

@ -202,7 +202,7 @@ static int lm8333_probe(struct i2c_client *client,
return err;
}
static int __devexit lm8333_remove(struct i2c_client *client)
static int lm8333_remove(struct i2c_client *client)
{
struct lm8333 *lm8333 = i2c_get_clientdata(client);

2
drivers/input/keyboard/locomokbd.c
View File

@ -321,7 +321,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
return err;
}
static int __devexit locomokbd_remove(struct locomo_dev *dev)
static int locomokbd_remove(struct locomo_dev *dev)
{
struct locomokbd *locomokbd = locomo_get_drvdata(dev);

2
drivers/input/keyboard/lpc32xx-keys.c
View File

@ -310,7 +310,7 @@ err_free_mem:
return error;
}
static int __devexit lpc32xx_kscan_remove(struct platform_device *pdev)
static int lpc32xx_kscan_remove(struct platform_device *pdev)
{
struct lpc32xx_kscan_drv *kscandat = platform_get_drvdata(pdev);

2
drivers/input/keyboard/matrix_keypad.c
View File

@ -539,7 +539,7 @@ err_free_mem:
return err;
}
static int __devexit matrix_keypad_remove(struct platform_device *pdev)
static int matrix_keypad_remove(struct platform_device *pdev)
{
struct matrix_keypad *keypad = platform_get_drvdata(pdev);

2
drivers/input/keyboard/max7359_keypad.c
View File

@ -260,7 +260,7 @@ failed_free_mem:
return error;
}
static int __devexit max7359_remove(struct i2c_client *client)
static int max7359_remove(struct i2c_client *client)
{
struct max7359_keypad *keypad = i2c_get_clientdata(client);

2
drivers/input/keyboard/mcs_touchkey.c
View File

@ -200,7 +200,7 @@ err_free_mem:
return error;
}
static int __devexit mcs_touchkey_remove(struct i2c_client *client)
static int mcs_touchkey_remove(struct i2c_client *client)
{
struct mcs_touchkey_data *data = i2c_get_clientdata(client);

2
drivers/input/keyboard/mpr121_touchkey.c
View File

@ -272,7 +272,7 @@ err_free_mem:
return error;
}
static int __devexit mpr_touchkey_remove(struct i2c_client *client)
static int mpr_touchkey_remove(struct i2c_client *client)
{
struct mpr121_touchkey *mpr121 = i2c_get_clientdata(client);

2
drivers/input/keyboard/nomadik-ske-keypad.c
View File

@ -366,7 +366,7 @@ err_free_mem:
return error;
}
static int __devexit ske_keypad_remove(struct platform_device *pdev)
static int ske_keypad_remove(struct platform_device *pdev)
{
struct ske_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

2
drivers/input/keyboard/omap-keypad.c
View File

@ -357,7 +357,7 @@ err2:
return -EINVAL;
}
static int __devexit omap_kp_remove(struct platform_device *pdev)
static int omap_kp_remove(struct platform_device *pdev)
{
struct omap_kp *omap_kp = platform_get_drvdata(pdev);

2
drivers/input/keyboard/omap4-keypad.c
View File

@ -406,7 +406,7 @@ err_free_keypad:
return error;
}
static int __devexit omap4_keypad_remove(struct platform_device *pdev)
static int omap4_keypad_remove(struct platform_device *pdev)
{
struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/keyboard/opencores-kbd.c
View File

@ -139,7 +139,7 @@ static int opencores_kbd_probe(struct platform_device *pdev)
return error;
}
static int __devexit opencores_kbd_remove(struct platform_device *pdev)
static int opencores_kbd_remove(struct platform_device *pdev)
{
struct opencores_kbd *opencores_kbd = platform_get_drvdata(pdev);

2
drivers/input/keyboard/pmic8xxx-keypad.c
View File

@ -712,7 +712,7 @@ err_alloc_device:
return rc;
}
static int __devexit pmic8xxx_kp_remove(struct platform_device *pdev)
static int pmic8xxx_kp_remove(struct platform_device *pdev)
{
struct pmic8xxx_kp *kp = platform_get_drvdata(pdev);

2
drivers/input/keyboard/pxa27x_keypad.c
View File

@ -595,7 +595,7 @@ failed_free:
return error;
}
static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
static int pxa27x_keypad_remove(struct platform_device *pdev)
{
struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/keyboard/pxa930_rotary.c
View File

@ -174,7 +174,7 @@ failed_free:
return err;
}
static int __devexit pxa930_rotary_remove(struct platform_device *pdev)
static int pxa930_rotary_remove(struct platform_device *pdev)
{
struct pxa930_rotary *r = platform_get_drvdata(pdev);

2
drivers/input/keyboard/qt1070.c
View File

@ -230,7 +230,7 @@ err_free_mem:
return err;
}
static int __devexit qt1070_remove(struct i2c_client *client)
static int qt1070_remove(struct i2c_client *client)
{
struct qt1070_data *data = i2c_get_clientdata(client);

2
drivers/input/keyboard/qt2160.c
View File

@ -335,7 +335,7 @@ err_free_mem:
return error;
}
static int __devexit qt2160_remove(struct i2c_client *client)
static int qt2160_remove(struct i2c_client *client)
{
struct qt2160_data *qt2160 = i2c_get_clientdata(client);

2
drivers/input/keyboard/samsung-keypad.c
View File

@ -523,7 +523,7 @@ err_free_mem:
return error;
}
static int __devexit samsung_keypad_remove(struct platform_device *pdev)
static int samsung_keypad_remove(struct platform_device *pdev)
{
struct samsung_keypad *keypad = platform_get_drvdata(pdev);

2
drivers/input/keyboard/sh_keysc.c
View File

@ -272,7 +272,7 @@ static int sh_keysc_probe(struct platform_device *pdev)
return error;
}
static int __devexit sh_keysc_remove(struct platform_device *pdev)
static int sh_keysc_remove(struct platform_device *pdev)
{
struct sh_keysc_priv *priv = platform_get_drvdata(pdev);

2
drivers/input/keyboard/spear-keyboard.c
View File

@ -279,7 +279,7 @@ static int spear_kbd_probe(struct platform_device *pdev)
return 0;
}
static int __devexit spear_kbd_remove(struct platform_device *pdev)
static int spear_kbd_remove(struct platform_device *pdev)
{
device_init_wakeup(&pdev->dev, 0);
platform_set_drvdata(pdev, NULL);

2
drivers/input/keyboard/stmpe-keypad.c
View File

@ -335,7 +335,7 @@ static int stmpe_keypad_probe(struct platform_device *pdev)
return 0;
}
static int __devexit stmpe_keypad_remove(struct platform_device *pdev)
static int stmpe_keypad_remove(struct platform_device *pdev)
{
struct stmpe_keypad *keypad = platform_get_drvdata(pdev);

2
drivers/input/keyboard/tc3589x-keypad.c
View File

@ -382,7 +382,7 @@ err_free_mem:
return error;
}
static int __devexit tc3589x_keypad_remove(struct platform_device *pdev)
static int tc3589x_keypad_remove(struct platform_device *pdev)
{
struct tc_keypad *keypad = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);

2
drivers/input/keyboard/tca6416-keypad.c
View File

@ -313,7 +313,7 @@ fail1:
return error;
}
static int __devexit tca6416_keypad_remove(struct i2c_client *client)
static int tca6416_keypad_remove(struct i2c_client *client)
{
struct tca6416_keypad_chip *chip = i2c_get_clientdata(client);

2
drivers/input/keyboard/tca8418_keypad.c
View File

@ -388,7 +388,7 @@ fail1:
return error;
}
static int __devexit tca8418_keypad_remove(struct i2c_client *client)
static int tca8418_keypad_remove(struct i2c_client *client)
{
struct tca8418_keypad *keypad_data = i2c_get_clientdata(client);

2
drivers/input/keyboard/tegra-kbc.c
View File

@ -838,7 +838,7 @@ err_free_pdata:
return err;
}
static int __devexit tegra_kbc_remove(struct platform_device *pdev)
static int tegra_kbc_remove(struct platform_device *pdev)
{
struct tegra_kbc *kbc = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/keyboard/tnetv107x-keypad.c
View File

@ -301,7 +301,7 @@ error_res:
return error;
}
static int __devexit keypad_remove(struct platform_device *pdev)
static int keypad_remove(struct platform_device *pdev)
{
struct keypad_data *kp = platform_get_drvdata(pdev);

2
drivers/input/keyboard/twl4030_keypad.c
View File

@ -432,7 +432,7 @@ err1:
return error;
}
static int __devexit twl4030_kp_remove(struct platform_device *pdev)
static int twl4030_kp_remove(struct platform_device *pdev)
{
struct twl4030_keypad *kp = platform_get_drvdata(pdev);

2
drivers/input/keyboard/w90p910_keypad.c
View File

@ -234,7 +234,7 @@ failed_free:
return error;
}
static int __devexit w90p910_keypad_remove(struct platform_device *pdev)
static int w90p910_keypad_remove(struct platform_device *pdev)
{
struct w90p910_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;

2
drivers/input/misc/88pm80x_onkey.c
View File

@ -139,7 +139,7 @@ out:
return err;
}
static int __devexit pm80x_onkey_remove(struct platform_device *pdev)
static int pm80x_onkey_remove(struct platform_device *pdev)
{
struct pm80x_onkey_info *info = platform_get_drvdata(pdev);

2
drivers/input/misc/88pm860x_onkey.c
View File

@ -121,7 +121,7 @@ out:
return ret;
}
static int __devexit pm860x_onkey_remove(struct platform_device *pdev)
static int pm860x_onkey_remove(struct platform_device *pdev)
{
struct pm860x_onkey_info *info = platform_get_drvdata(pdev);

2
drivers/input/misc/ab8500-ponkey.c
View File

@ -118,7 +118,7 @@ err_free_mem:
return error;
}
static int __devexit ab8500_ponkey_remove(struct platform_device *pdev)
static int ab8500_ponkey_remove(struct platform_device *pdev)
{
struct ab8500_ponkey *ponkey = platform_get_drvdata(pdev);

2
drivers/input/misc/ad714x-i2c.c
View File

@ -87,7 +87,7 @@ static int ad714x_i2c_probe(struct i2c_client *client,
return 0;
}
static int __devexit ad714x_i2c_remove(struct i2c_client *client)
static int ad714x_i2c_remove(struct i2c_client *client)
{
struct ad714x_chip *chip = i2c_get_clientdata(client);

2
drivers/input/misc/ad714x-spi.c
View File

@ -103,7 +103,7 @@ static int ad714x_spi_probe(struct spi_device *spi)
return 0;
}
static int __devexit ad714x_spi_remove(struct spi_device *spi)
static int ad714x_spi_remove(struct spi_device *spi)
{
struct ad714x_chip *chip = spi_get_drvdata(spi);

2
drivers/input/misc/adxl34x-i2c.c
View File

@ -98,7 +98,7 @@ static int adxl34x_i2c_probe(struct i2c_client *client,
return 0;
}
static int __devexit adxl34x_i2c_remove(struct i2c_client *client)
static int adxl34x_i2c_remove(struct i2c_client *client)
{
struct adxl34x *ac = i2c_get_clientdata(client);

2
drivers/input/misc/adxl34x-spi.c
View File

@ -87,7 +87,7 @@ static int adxl34x_spi_probe(struct spi_device *spi)
return 0;
}
static int __devexit adxl34x_spi_remove(struct spi_device *spi)
static int adxl34x_spi_remove(struct spi_device *spi)
{
struct adxl34x *ac = dev_get_drvdata(&spi->dev);

2
drivers/input/misc/bfin_rotary.c
View File

@ -196,7 +196,7 @@ out1:
return error;
}
static int __devexit bfin_rotary_remove(struct platform_device *pdev)
static int bfin_rotary_remove(struct platform_device *pdev)
{
struct bfin_rot *rotary = platform_get_drvdata(pdev);

2
drivers/input/misc/bma150.c
View File

@ -613,7 +613,7 @@ err_free_mem:
return error;
}
static int __devexit bma150_remove(struct i2c_client *client)
static int bma150_remove(struct i2c_client *client)
{
struct bma150_data *bma150 = i2c_get_clientdata(client);

2
drivers/input/misc/cma3000_d0x_i2c.c
View File

@ -69,7 +69,7 @@ static int cma3000_i2c_probe(struct i2c_client *client,
return 0;
}
static int __devexit cma3000_i2c_remove(struct i2c_client *client)
static int cma3000_i2c_remove(struct i2c_client *client)
{
struct cma3000_accl_data *data = i2c_get_clientdata(client);

2
drivers/input/misc/cobalt_btns.c
View File

@ -135,7 +135,7 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
return error;
}
static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
static int cobalt_buttons_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct buttons_dev *bdev = dev_get_drvdata(dev);

2
drivers/input/misc/da9052_onkey.c
View File

@ -141,7 +141,7 @@ err_free_mem:
return error;
}
static int __devexit da9052_onkey_remove(struct platform_device *pdev)
static int da9052_onkey_remove(struct platform_device *pdev)
{
struct da9052_onkey *onkey = platform_get_drvdata(pdev);

2
drivers/input/misc/da9055_onkey.c
View File

@ -141,7 +141,7 @@ err_free_input:
return err;
}
static int __devexit da9055_onkey_remove(struct platform_device *pdev)
static int da9055_onkey_remove(struct platform_device *pdev)
{
struct da9055_onkey *onkey = platform_get_drvdata(pdev);
int irq = platform_get_irq_byname(pdev, "ONKEY");

2
drivers/input/misc/dm355evm_keys.c
View File

@ -239,7 +239,7 @@ fail1:
return status;
}
static int __devexit dm355evm_keys_remove(struct platform_device *pdev)
static int dm355evm_keys_remove(struct platform_device *pdev)
{
struct dm355evm_keys *keys = platform_get_drvdata(pdev);

2
drivers/input/misc/gp2ap002a00f.c
View File

@ -205,7 +205,7 @@ err_hw_shutdown:
return error;
}
static int __devexit gp2a_remove(struct i2c_client *client)
static int gp2a_remove(struct i2c_client *client)
{
struct gp2a_data *dt = i2c_get_clientdata(client);
const struct gp2a_platform_data *pdata = dt->pdata;

2
drivers/input/misc/gpio_tilt_polled.c
View File

@ -179,7 +179,7 @@ err_free_tdev:
return error;
}
static int __devexit gpio_tilt_polled_remove(struct platform_device *pdev)
static int gpio_tilt_polled_remove(struct platform_device *pdev)
{
struct gpio_tilt_polled_dev *tdev = platform_get_drvdata(pdev);
const struct gpio_tilt_platform_data *pdata = tdev->pdata;

2
drivers/input/misc/ixp4xx-beeper.c
View File

@ -132,7 +132,7 @@ static int ixp4xx_spkr_probe(struct platform_device *dev)
return err;
}
static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
static int ixp4xx_spkr_remove(struct platform_device *dev)
{
struct input_dev *input_dev = platform_get_drvdata(dev);
unsigned int pin = (unsigned int) input_get_drvdata(input_dev);

4
drivers/input/misc/kxtj9.c
View File

@ -466,7 +466,7 @@ static int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
return 0;
}
static void __devexit kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
static void kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
{
input_unregister_polled_device(tj9->poll_dev);
input_free_polled_device(tj9->poll_dev);
@ -594,7 +594,7 @@ err_free_mem:
return err;
}
static int __devexit kxtj9_remove(struct i2c_client *client)
static int kxtj9_remove(struct i2c_client *client)
{
struct kxtj9_data *tj9 = i2c_get_clientdata(client);

2
drivers/input/misc/m68kspkr.c
View File

@ -80,7 +80,7 @@ static int m68kspkr_probe(struct platform_device *dev)
return 0;
}
static int __devexit m68kspkr_remove(struct platform_device *dev)
static int m68kspkr_remove(struct platform_device *dev)
{
struct input_dev *input_dev = platform_get_drvdata(dev);

2
drivers/input/misc/max8925_onkey.c
View File

@ -141,7 +141,7 @@ err_free_mem:
return error;
}
static int __devexit max8925_onkey_remove(struct platform_device *pdev)
static int max8925_onkey_remove(struct platform_device *pdev)
{
struct max8925_onkey_info *info = platform_get_drvdata(pdev);
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);

2
drivers/input/misc/max8997_haptic.c
View File

@ -354,7 +354,7 @@ err_free_mem:
return error;
}
static int __devexit max8997_haptic_remove(struct platform_device *pdev)
static int max8997_haptic_remove(struct platform_device *pdev)
{
struct max8997_haptic *chip = platform_get_drvdata(pdev);

2
drivers/input/misc/mc13783-pwrbutton.c
View File

@ -230,7 +230,7 @@ free_input_dev:
return err;
}
static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev)
static int mc13783_pwrbutton_remove(struct platform_device *pdev)
{
struct mc13783_pwrb *priv = platform_get_drvdata(pdev);
const struct mc13xxx_buttons_platform_data *pdata;

2
drivers/input/misc/mma8450.c
View File

@ -212,7 +212,7 @@ err_free_mem:
return err;
}
static int __devexit mma8450_remove(struct i2c_client *c)
static int mma8450_remove(struct i2c_client *c)
{
struct mma8450 *m = i2c_get_clientdata(c);
struct input_polled_dev *idev = m->idev;

2
drivers/input/misc/mpu3050.c
View File

@ -402,7 +402,7 @@ err_free_mem:
*
* Our sensor is going away, clean up the resources.
*/
static int __devexit mpu3050_remove(struct i2c_client *client)
static int mpu3050_remove(struct i2c_client *client)
{
struct mpu3050_sensor *sensor = i2c_get_clientdata(client);

2
drivers/input/misc/pcap_keys.c
View File

@ -104,7 +104,7 @@ fail:
return err;
}
static int __devexit pcap_keys_remove(struct platform_device *pdev)
static int pcap_keys_remove(struct platform_device *pdev)
{
struct pcap_keys *pcap_keys = platform_get_drvdata(pdev);

2
drivers/input/misc/pcf50633-input.c
View File

@ -93,7 +93,7 @@ static int pcf50633_input_probe(struct platform_device *pdev)
return 0;
}
static int __devexit pcf50633_input_remove(struct platform_device *pdev)
static int pcf50633_input_remove(struct platform_device *pdev)
{
struct pcf50633_input *input = platform_get_drvdata(pdev);

2
drivers/input/misc/pcf8574_keypad.c
View File

@ -156,7 +156,7 @@ static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_i
return ret;
}
static int __devexit pcf8574_kp_remove(struct i2c_client *client)
static int pcf8574_kp_remove(struct i2c_client *client)
{
struct kp_data *lp = i2c_get_clientdata(client);

2
drivers/input/misc/pcspkr.c
View File

@ -95,7 +95,7 @@ static int pcspkr_probe(struct platform_device *dev)
return 0;
}
static int __devexit pcspkr_remove(struct platform_device *dev)
static int pcspkr_remove(struct platform_device *dev)
{
struct input_dev *pcspkr_dev = platform_get_drvdata(dev);

2
drivers/input/misc/pm8xxx-vibrator.c
View File

@ -242,7 +242,7 @@ err_free_mem:
return error;
}
static int __devexit pm8xxx_vib_remove(struct platform_device *pdev)
static int pm8xxx_vib_remove(struct platform_device *pdev)
{
struct pm8xxx_vib *vib = platform_get_drvdata(pdev);

2
drivers/input/misc/pmic8xxx-pwrkey.c
View File

@ -187,7 +187,7 @@ free_pwrkey:
return err;
}
static int __devexit pmic8xxx_pwrkey_remove(struct platform_device *pdev)
static int pmic8xxx_pwrkey_remove(struct platform_device *pdev)
{
struct pmic8xxx_pwrkey *pwrkey = platform_get_drvdata(pdev);
int key_release_irq = platform_get_irq(pdev, 0);

2
drivers/input/misc/pwm-beeper.c
View File

@ -129,7 +129,7 @@ err_free:
return error;
}
static int __devexit pwm_beeper_remove(struct platform_device *pdev)
static int pwm_beeper_remove(struct platform_device *pdev)
{
struct pwm_beeper *beeper = platform_get_drvdata(pdev);

2
drivers/input/misc/rb532_button.c
View File

@ -81,7 +81,7 @@ static int rb532_button_probe(struct platform_device *pdev)
return 0;
}
static int __devexit rb532_button_remove(struct platform_device *pdev)
static int rb532_button_remove(struct platform_device *pdev)
{
struct input_polled_dev *poll_dev = dev_get_drvdata(&pdev->dev);

2
drivers/input/misc/retu-pwrbutton.c
View File

@ -76,7 +76,7 @@ static int retu_pwrbutton_probe(struct platform_device *pdev)
return 0;
}
static int __devexit retu_pwrbutton_remove(struct platform_device *pdev)
static int retu_pwrbutton_remove(struct platform_device *pdev)
{
return 0;
}

2
drivers/input/misc/rotary_encoder.c
View File

@ -301,7 +301,7 @@ exit_free_mem:
return err;
}
static int __devexit rotary_encoder_remove(struct platform_device *pdev)
static int rotary_encoder_remove(struct platform_device *pdev)
{
struct rotary_encoder *encoder = platform_get_drvdata(pdev);
const struct rotary_encoder_platform_data *pdata = encoder->pdata;

2
drivers/input/misc/sgi_btns.c
View File

@ -143,7 +143,7 @@ static int sgi_buttons_probe(struct platform_device *pdev)
return error;
}
static int __devexit sgi_buttons_remove(struct platform_device *pdev)
static int sgi_buttons_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct buttons_dev *bdev = dev_get_drvdata(dev);

4
drivers/input/misc/sparcspkr.c
View File

@ -229,7 +229,7 @@ out_err:
return err;
}
static int __devexit bbc_remove(struct platform_device *op)
static int bbc_remove(struct platform_device *op)
{
struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
struct input_dev *input_dev = state->input_dev;
@ -310,7 +310,7 @@ out_err:
return err;
}
static int __devexit grover_remove(struct platform_device *op)
static int grover_remove(struct platform_device *op)
{
struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
struct grover_beep_info *info = &state->u.grover;

2
drivers/input/misc/twl4030-vibra.c
View File

@ -269,7 +269,7 @@ err_kzalloc:
return ret;
}
static int __devexit twl4030_vibra_remove(struct platform_device *pdev)
static int twl4030_vibra_remove(struct platform_device *pdev)
{
struct vibra_info *info = platform_get_drvdata(pdev);

2
drivers/input/misc/twl6040-vibra.c
View File

@ -418,7 +418,7 @@ err_kzalloc:
return ret;
}
static int __devexit twl6040_vibra_remove(struct platform_device *pdev)
static int twl6040_vibra_remove(struct platform_device *pdev)
{
struct vibra_info *info = platform_get_drvdata(pdev);

4
drivers/input/misc/wistron_btns.c
View File

@ -1077,7 +1077,7 @@ static void wistron_led_init(struct device *parent)
}
}
static void __devexit wistron_led_remove(void)
static void wistron_led_remove(void)
{
if (leds_present & FE_MAIL_LED)
led_classdev_unregister(&wistron_mail_led);
@ -1277,7 +1277,7 @@ static int wistron_probe(struct platform_device *dev)
return 0;
}
static int __devexit wistron_remove(struct platform_device *dev)
static int wistron_remove(struct platform_device *dev)
{
wistron_led_remove();
input_unregister_polled_device(wistron_idev);

2
drivers/input/misc/wm831x-on.c
View File

@ -124,7 +124,7 @@ err:
return ret;
}
static int __devexit wm831x_on_remove(struct platform_device *pdev)
static int wm831x_on_remove(struct platform_device *pdev)
{
struct wm831x_on *wm831x_on = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);

2
drivers/input/mouse/gpio_mouse.c
View File

@ -150,7 +150,7 @@ static int gpio_mouse_probe(struct platform_device *pdev)
return error;
}
static int __devexit gpio_mouse_remove(struct platform_device *pdev)
static int gpio_mouse_remove(struct platform_device *pdev)
{
struct input_polled_dev *input = platform_get_drvdata(pdev);
struct gpio_mouse_platform_data *pdata = input->private;

2
drivers/input/mouse/maplemouse.c
View File

@ -114,7 +114,7 @@ fail:
return error;
}
static int __devexit remove_maple_mouse(struct device *dev)
static int remove_maple_mouse(struct device *dev)
{
struct maple_device *mdev = to_maple_dev(dev);
struct dc_mouse *mse = maple_get_drvdata(mdev);

2
drivers/input/mouse/navpoint.c
View File

@ -299,7 +299,7 @@ err_free_gpio:
return error;
}
static int __devexit navpoint_remove(struct platform_device *pdev)
static int navpoint_remove(struct platform_device *pdev)
{
const struct navpoint_platform_data *pdata =
dev_get_platdata(&pdev->dev);

2
drivers/input/mouse/pxa930_trkball.c
View File

@ -230,7 +230,7 @@ failed:
return error;
}
static int __devexit pxa930_trkball_remove(struct platform_device *pdev)
static int pxa930_trkball_remove(struct platform_device *pdev)
{
struct pxa930_trkball *trkball = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);

2
drivers/input/mouse/synaptics_i2c.c
View File

@ -601,7 +601,7 @@ err_mem_free:
return ret;
}
static int __devexit synaptics_i2c_remove(struct i2c_client *client)
static int synaptics_i2c_remove(struct i2c_client *client)
{
struct synaptics_i2c *touch = i2c_get_clientdata(client);

2
drivers/input/serio/altera_ps2.c
View File

@ -159,7 +159,7 @@ static int altera_ps2_probe(struct platform_device *pdev)
/*
* Remove one device from this driver.
*/
static int __devexit altera_ps2_remove(struct platform_device *pdev)
static int altera_ps2_remove(struct platform_device *pdev)
{
struct ps2if *ps2if = platform_get_drvdata(pdev);

2
drivers/input/serio/ambakmi.c
View File

@ -163,7 +163,7 @@ static int amba_kmi_probe(struct amba_device *dev,
return ret;
}
static int __devexit amba_kmi_remove(struct amba_device *dev)
static int amba_kmi_remove(struct amba_device *dev)
{
struct amba_kmi_port *kmi = amba_get_drvdata(dev);

2
drivers/input/serio/arc_ps2.c
View File

@ -242,7 +242,7 @@ static int arc_ps2_probe(struct platform_device *pdev)
return 0;
}
static int __devexit arc_ps2_remove(struct platform_device *pdev)
static int arc_ps2_remove(struct platform_device *pdev)
{
struct arc_ps2_data *arc_ps2 = platform_get_drvdata(pdev);
int i;

2
drivers/input/serio/ct82c710.c
View File

@ -199,7 +199,7 @@ static int ct82c710_probe(struct platform_device *dev)
return 0;
}
static int __devexit ct82c710_remove(struct platform_device *dev)
static int ct82c710_remove(struct platform_device *dev)
{
serio_unregister_port(ct82c710_port);

2
drivers/input/serio/gscps2.c
View File

@ -414,7 +414,7 @@ fail_nomem:
* @return: success/error report
*/
static int __devexit gscps2_remove(struct parisc_device *dev)
static int gscps2_remove(struct parisc_device *dev)
{
struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);

2
drivers/input/serio/i8042-sparcio.h
View File

@ -80,7 +80,7 @@ static int sparc_i8042_probe(struct platform_device *op)
return 0;
}
static int __devexit sparc_i8042_remove(struct platform_device *op)
static int sparc_i8042_remove(struct platform_device *op)
{
of_iounmap(kbd_res, kbd_iobase, 8);

4
drivers/input/serio/i8042.c
View File

@ -1284,7 +1284,7 @@ static void __init i8042_register_ports(void)
}
}
static void __devexit i8042_unregister_ports(void)
static void i8042_unregister_ports(void)
{
int i;
@ -1437,7 +1437,7 @@ static int __init i8042_probe(struct platform_device *dev)
return error;
}
static int __devexit i8042_remove(struct platform_device *dev)
static int i8042_remove(struct platform_device *dev)
{
i8042_unregister_ports();
i8042_free_irqs();

2
drivers/input/serio/maceps2.c
View File

@ -151,7 +151,7 @@ static int maceps2_probe(struct platform_device *dev)
return 0;
}
static int __devexit maceps2_remove(struct platform_device *dev)
static int maceps2_remove(struct platform_device *dev)
{
serio_unregister_port(maceps2_port[0]);
serio_unregister_port(maceps2_port[1]);

2
drivers/input/serio/pcips2.c
View File

@ -176,7 +176,7 @@ static int pcips2_probe(struct pci_dev *dev, const struct pci_device_id *id)
return ret;
}
static void __devexit pcips2_remove(struct pci_dev *dev)
static void pcips2_remove(struct pci_dev *dev)
{
struct pcips2_data *ps2if = pci_get_drvdata(dev);

2
drivers/input/serio/q40kbd.c
View File

@ -168,7 +168,7 @@ err_free_mem:
return error;
}
static int __devexit q40kbd_remove(struct platform_device *pdev)
static int q40kbd_remove(struct platform_device *pdev)
{
struct q40kbd *q40kbd = platform_get_drvdata(pdev);

2
drivers/input/serio/rpckbd.c
View File

@ -153,7 +153,7 @@ static int rpckbd_probe(struct platform_device *dev)
return 0;
}
static int __devexit rpckbd_remove(struct platform_device *dev)
static int rpckbd_remove(struct platform_device *dev)
{
struct serio *serio = platform_get_drvdata(dev);
struct rpckbd_data *rpckbd = serio->port_data;

Some files were not shown because too many files have changed in this diff Show More