Commit e2619cf7 authored by Bill Pemberton's avatar Bill Pemberton Committed by Dmitry Torokhov

Input: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5298cc4c
......@@ -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);
......
......@@ -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);
......
......@@ -341,7 +341,7 @@ static int as5011_probe(struct i2c_client *client,
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);
......
......@@ -157,7 +157,7 @@ static int probe_maple_controller(struct device *dev)
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);
......
......@@ -182,7 +182,7 @@ static int adp5520_keys_probe(struct platform_device *pdev)
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);
......
......@@ -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);
......
......@@ -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 @@ static int adp5589_probe(struct i2c_client *client,
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);
......
......@@ -331,7 +331,7 @@ static int bfin_kpad_probe(struct platform_device *pdev)
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);
......
......@@ -303,7 +303,7 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
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);
......
......@@ -346,7 +346,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev)
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;
......
......@@ -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;
......
......@@ -328,7 +328,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
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;
......
......@@ -286,7 +286,7 @@ static int hil_keyb_init(void)
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();
......
......@@ -554,7 +554,7 @@ static int imx_keypad_probe(struct platform_device *pdev)
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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -764,7 +764,7 @@ static int lm8323_probe(struct i2c_client *client,
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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -310,7 +310,7 @@ static int lpc32xx_kscan_probe(struct platform_device *pdev)
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);
......
......@@ -539,7 +539,7 @@ static int matrix_keypad_probe(struct platform_device *pdev)
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);
......
......@@ -260,7 +260,7 @@ static int max7359_probe(struct i2c_client *client,
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);
......
......@@ -200,7 +200,7 @@ static int mcs_touchkey_probe(struct i2c_client *client,
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);
......
......@@ -272,7 +272,7 @@ static int mpr_touchkey_probe(struct i2c_client *client,
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);
......
......@@ -366,7 +366,7 @@ static int __init ske_keypad_probe(struct platform_device *pdev)
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);
......
......@@ -357,7 +357,7 @@ static int omap_kp_probe(struct platform_device *pdev)
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);
......
......@@ -406,7 +406,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
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;
......
......@@ -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);
......
......@@ -712,7 +712,7 @@ static int pmic8xxx_kp_probe(struct platform_device *pdev)
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);
......
......@@ -595,7 +595,7 @@ static int pxa27x_keypad_probe(struct platform_device *pdev)
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;
......
......@@ -174,7 +174,7 @@ static int pxa930_rotary_probe(struct platform_device *pdev)
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);
......
......@@ -230,7 +230,7 @@ static int qt1070_probe(struct i2c_client *client,
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);
......
......@@ -335,7 +335,7 @@ static int qt2160_probe(struct i2c_client *client,
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);
......
......@@ -523,7 +523,7 @@ static int samsung_keypad_probe(struct platform_device *pdev)
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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -382,7 +382,7 @@ static int tc3589x_keypad_probe(struct platform_device *pdev)
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);
......
......@@ -313,7 +313,7 @@ static int tca6416_keypad_probe(struct i2c_client *client,
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);
......
......@@ -388,7 +388,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
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);
......
......@@ -838,7 +838,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
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;
......
......@@ -301,7 +301,7 @@ static int keypad_probe(struct platform_device *pdev)
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);
......
......@@ -432,7 +432,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
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);
......
......@@ -234,7 +234,7 @@ static int w90p910_keypad_probe(struct platform_device *pdev)
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;
......
......@@ -139,7 +139,7 @@ static int pm80x_onkey_probe(struct platform_device *pdev)
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);
......
......@@ -121,7 +121,7 @@ static int pm860x_onkey_probe(struct platform_device *pdev)
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);
......
......@@ -118,7 +118,7 @@ static int ab8500_ponkey_probe(struct platform_device *pdev)
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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -196,7 +196,7 @@ static int bfin_rotary_probe(struct platform_device *pdev)
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);
......
......@@ -613,7 +613,7 @@ static int bma150_probe(struct i2c_client *client,
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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -141,7 +141,7 @@ static int da9052_onkey_probe(struct platform_device *pdev)
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);
......
......@@ -141,7 +141,7 @@ static int da9055_onkey_probe(struct platform_device *pdev)
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");
......
......@@ -239,7 +239,7 @@ static int dm355evm_keys_probe(struct platform_device *pdev)
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);
......
......@@ -205,7 +205,7 @@ static int gp2a_probe(struct i2c_client *client,
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;
......
......@@ -179,7 +179,7 @@ static int gpio_tilt_polled_probe(struct platform_device *pdev)
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;
......
......@@ -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);
......
......@@ -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 @@ static int kxtj9_probe(struct i2c_client *client,
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);
......
......@@ -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);
......
......@@ -141,7 +141,7 @@ static int max8925_onkey_probe(struct platform_device *pdev)
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);
......
......@@ -354,7 +354,7 @@ static int max8997_haptic_probe(struct platform_device *pdev)