mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge commit 'v2.6.35-rc3' into for-linus
This commit is contained in:
commit
0e789314f8
1029 changed files with 83540 additions and 7874 deletions
|
|
@ -287,7 +287,6 @@ static int __devexit adp5588_remove(struct i2c_client *client)
|
|||
free_irq(client->irq, kpad);
|
||||
cancel_delayed_work_sync(&kpad->work);
|
||||
input_unregister_device(kpad->input);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(kpad);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -778,8 +778,6 @@ static int __devexit lm8323_remove(struct i2c_client *client)
|
|||
struct lm8323_chip *lm = i2c_get_clientdata(client);
|
||||
int i;
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
disable_irq_wake(client->irq);
|
||||
free_irq(client->irq, lm);
|
||||
cancel_work_sync(&lm->work);
|
||||
|
|
|
|||
|
|
@ -265,7 +265,6 @@ static int __devexit max7359_remove(struct i2c_client *client)
|
|||
|
||||
free_irq(client->irq, keypad);
|
||||
input_unregister_device(keypad->input_dev);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(keypad);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -358,7 +358,6 @@ static int __devexit qt2160_remove(struct i2c_client *client)
|
|||
input_unregister_device(qt2160->input);
|
||||
kfree(qt2160);
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -316,8 +316,6 @@ static int __devexit tca6416_keypad_remove(struct i2c_client *client)
|
|||
input_unregister_device(chip->input);
|
||||
kfree(chip);
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ static int __devexit ad714x_i2c_remove(struct i2c_client *client)
|
|||
struct ad714x_chip *chip = i2c_get_clientdata(client);
|
||||
|
||||
ad714x_remove(chip);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = {
|
|||
.llseek = no_llseek,
|
||||
.read = hp_sdc_rtc_read,
|
||||
.poll = hp_sdc_rtc_poll,
|
||||
.unlocked_ioctl = hp_sdc_rtc_ioctl,
|
||||
.unlocked_ioctl = hp_sdc_rtc_unlocked_ioctl,
|
||||
.open = hp_sdc_rtc_open,
|
||||
.fasync = hp_sdc_rtc_fasync,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -168,8 +168,6 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client)
|
|||
input_unregister_device(lp->idev);
|
||||
kfree(lp);
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -613,7 +613,6 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client)
|
|||
free_irq(client->irq, touch);
|
||||
|
||||
input_unregister_device(touch->input);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(touch);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ if SERIO
|
|||
config SERIO_I8042
|
||||
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
|
||||
default y
|
||||
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
|
||||
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
|
||||
(!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
|
||||
help
|
||||
i8042 is the chip over which the standard AT keyboard and PS/2
|
||||
mouse are connected to the computer. If you use these devices,
|
||||
|
|
|
|||
|
|
@ -812,10 +812,8 @@ static int __devinit ad7879_probe(struct i2c_client *client,
|
|||
ts->bus = client;
|
||||
|
||||
error = ad7879_construct(client, ts);
|
||||
if (error) {
|
||||
i2c_set_clientdata(client, NULL);
|
||||
if (error)
|
||||
kfree(ts);
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
|
|
@ -825,7 +823,6 @@ static int __devexit ad7879_remove(struct i2c_client *client)
|
|||
struct ad7879 *ts = dev_get_drvdata(&client->dev);
|
||||
|
||||
ad7879_destroy(client, ts);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(ts);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -238,7 +238,6 @@ err2:
|
|||
input = NULL; /* so we dont try to free it below */
|
||||
err1:
|
||||
input_free_device(input);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(priv);
|
||||
err0:
|
||||
return err;
|
||||
|
|
@ -256,7 +255,6 @@ static int __devexit eeti_ts_remove(struct i2c_client *client)
|
|||
enable_irq(priv->irq);
|
||||
|
||||
input_unregister_device(priv->input);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
kfree(priv);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -256,7 +256,6 @@ static int __devexit mcs5000_ts_remove(struct i2c_client *client)
|
|||
free_irq(client->irq, data);
|
||||
input_unregister_device(data->input_dev);
|
||||
kfree(data);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -347,8 +347,6 @@ static int __devexit tsc2007_remove(struct i2c_client *client)
|
|||
struct tsc2007 *ts = i2c_get_clientdata(client);
|
||||
struct tsc2007_platform_data *pdata = client->dev.platform_data;
|
||||
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
tsc2007_free_irq(ts);
|
||||
|
||||
if (pdata->exit_platform_hw)
|
||||
|
|
|
|||
Loading…
Reference in a new issue