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:
committed by
Dmitry Torokhov
parent
5298cc4cc7
commit
e2619cf78e
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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 @@ 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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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 @@ 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);
|
||||
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 @@ 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);
|
||||
|
||||
|
||||
@@ -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 @@ 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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user