Make module unloading and reloading behave:
- Driver probe could fail if input_register_device fails as
no error was returned from probe
- Driver interrupt was using unused platform_data field,
change to use i2c platform data interrupt instead
- Free resources on unloading module
- Mark platform data as __init_or_module
Signed-off-by: Tony Lindgren <tony@atomide.com>
extern struct tcm825x_platform_data n800_tcm825x_platform_data;
extern struct tcm825x_platform_data n800_tcm825x_platform_data;
-static struct i2c_board_info __initdata n800_i2c_board_info_2[] = {
+static struct i2c_board_info __initdata_or_module n800_i2c_board_info_2[] = {
#if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
{
I2C_BOARD_INFO(TCM825X_NAME, TCM825X_I2C_ADDR),
#if defined (CONFIG_VIDEO_TCM825X) || defined (CONFIG_VIDEO_TCM825X_MODULE)
{
I2C_BOARD_INFO(TCM825X_NAME, TCM825X_I2C_ADDR),
struct i2c_client *client;
struct work_struct work;
struct input_dev *idev;
struct i2c_client *client;
struct work_struct work;
struct input_dev *idev;
unsigned kp_enabled : 1;
unsigned pm_suspend : 1;
unsigned keys_down;
unsigned kp_enabled : 1;
unsigned pm_suspend : 1;
unsigned keys_down;
if (init_pwm(lm, 3, &client->dev, lm8323_pdata->pwm3_name) < 0)
goto fail5;
if (init_pwm(lm, 3, &client->dev, lm8323_pdata->pwm3_name) < 0)
goto fail5;
- lm->irq = lm8323_pdata->irq_gpio;
- debug(&c->dev, "IRQ: %d\n", lm->irq);
-
mutex_init(&lm->lock);
INIT_WORK(&lm->work, lm8323_work);
mutex_init(&lm->lock);
INIT_WORK(&lm->work, lm8323_work);
IRQF_TRIGGER_FALLING | IRQF_DISABLED |
IRQF_SAMPLE_RANDOM, DRIVER_NAME, lm);
if (err) {
IRQF_TRIGGER_FALLING | IRQF_DISABLED |
IRQF_SAMPLE_RANDOM, DRIVER_NAME, lm);
if (err) {
- dev_err(&client->dev, "could not get IRQ %d\n", lm->irq);
+ dev_err(&client->dev, "could not get IRQ %d\n", client->irq);
- set_irq_wake(lm->irq, 1);
+ set_irq_wake(client->irq, 1);
lm->kp_enabled = 1;
err = device_create_file(&client->dev, &dev_attr_disable_kp);
lm->kp_enabled = 1;
err = device_create_file(&client->dev, &dev_attr_disable_kp);
set_bit(EV_REP, idev->evbit);
lm->idev = idev;
set_bit(EV_REP, idev->evbit);
lm->idev = idev;
- if (input_register_device(idev)) {
+ err = input_register_device(idev);
+ if (err) {
dev_dbg(&client->dev, "error registering input device\n");
goto fail8;
}
dev_dbg(&client->dev, "error registering input device\n");
goto fail8;
}
fail8:
device_remove_file(&client->dev, &dev_attr_disable_kp);
fail7:
fail8:
device_remove_file(&client->dev, &dev_attr_disable_kp);
fail7:
+ free_irq(client->irq, lm);
fail6:
if (lm->pwm3.enabled)
led_classdev_unregister(&lm->pwm3.cdev);
fail6:
if (lm->pwm3.enabled)
led_classdev_unregister(&lm->pwm3.cdev);
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
+ free_irq(client->irq, lm);
+ cancel_work_sync(&lm->work);
+ input_unregister_device(lm->idev);
device_remove_file(&lm->client->dev, &dev_attr_disable_kp);
device_remove_file(&lm->client->dev, &dev_attr_disable_kp);
+ if (lm->pwm3.enabled)
+ led_classdev_unregister(&lm->pwm3.cdev);
+ if (lm->pwm2.enabled)
+ led_classdev_unregister(&lm->pwm2.cdev);
+ if (lm->pwm1.enabled)
+ led_classdev_unregister(&lm->pwm1.cdev);
+ kfree(lm);
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
- set_irq_wake(lm->irq, 0);
- disable_irq(lm->irq);
+ set_irq_wake(client->irq, 0);
+ disable_irq(client->irq);
mutex_lock(&lm->lock);
lm->pm_suspend = 1;
mutex_lock(&lm->lock);
lm->pm_suspend = 1;
if (lm->pwm3.enabled)
led_classdev_resume(&lm->pwm3.cdev);
if (lm->pwm3.enabled)
led_classdev_resume(&lm->pwm3.cdev);
- enable_irq(lm->irq);
- set_irq_wake(lm->irq, 1);
+ enable_irq(client->irq);
+ set_irq_wake(client->irq, 1);
#define LM8323_KEYMAP_SIZE (0x7f + 1)
struct lm8323_platform_data {
#define LM8323_KEYMAP_SIZE (0x7f + 1)
struct lm8323_platform_data {
int debounce_time; /* Time to watch for key bouncing, in ms. */
int active_time; /* Idle time until sleep, in ms. */
int debounce_time; /* Time to watch for key bouncing, in ms. */
int active_time; /* Idle time until sleep, in ms. */