Skip to content

Commit

Permalink
Input: remove use of __devexit
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Bill Pemberton authored and Dmitry Torokhov committed Nov 24, 2012
1 parent 5298cc4 commit e2619cf
Show file tree
Hide file tree
Showing 141 changed files with 149 additions and 149 deletions.
2 changes: 1 addition & 1 deletion drivers/input/gameport/emu10k1-gp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/gameport/fm801-gp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/as5011.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/joystick/maplecontrol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/adp5520-keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/input/keyboard/adp5588-keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/input/keyboard/adp5589-keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/bf54x-keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/davinci_keyscan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/ep93xx_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/gpio_keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/gpio_keys_polled.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/input/keyboard/hilkbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/imx_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/jornada680_kbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/jornada720_kbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/lm8323.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/lm8333.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/locomokbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/lpc32xx-keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/matrix_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/max7359_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/mcs_touchkey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/mpr121_touchkey.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/nomadik-ske-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/omap-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/omap4-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/opencores-kbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/pmic8xxx-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/pxa27x_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/pxa930_rotary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/qt1070.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/qt2160.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/samsung-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/sh_keysc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/spear-keyboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/stmpe-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/tc3589x-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/tca6416-keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/tca8418_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/tegra-kbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit e2619cf

Please sign in to comment.