* Felipe Balbi <me@xxxxxxxxxxxxxxx> [080515 01:00]:
> On Wed, May 14, 2008 at 09:01:18PM -0700, Tony Lindgren wrote:
> > 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@xxxxxxxxxxx>
> > ---
> > arch/arm/mach-omap2/board-n800.c | 2 +-
> > drivers/input/keyboard/lm8323.c | 18 +++++++++++++-----
> > include/linux/i2c/lm8323.h | 2 --
> > 3 files changed, 14 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
> > index efcb25d..ae85c2c 100644
> > --- a/arch/arm/mach-omap2/board-n800.c
> > +++ b/arch/arm/mach-omap2/board-n800.c
> > @@ -642,7 +642,7 @@ static struct i2c_board_info __initdata n800_i2c_board_info_1[] = {
> >
> > 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),
> > diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
> > index e793ae7..d472da0 100644
> > --- a/drivers/input/keyboard/lm8323.c
> > +++ b/drivers/input/keyboard/lm8323.c
> > @@ -755,13 +755,11 @@ static int lm8323_probe(struct i2c_client *client,
> > 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);
> > -
> > + lm->irq = client->irq;
> > mutex_init(&lm->lock);
> > INIT_WORK(&lm->work, lm8323_work);
> >
> > - err = request_irq(client->irq, lm8323_irq,
> > + err = request_irq(lm->irq, lm8323_irq,
>
> instead, you could just remove lm->irq field from structure and keep
> using client->irq.
Good idea, here's an updated patch.
Tony
>From aa1c7706df6f99df31322d297e7142267e237819 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Mon, 12 May 2008 22:53:07 -0700
Subject: [PATCH] Input: Fix lm8323 probe and module unloading
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@xxxxxxxxxxx>
---
arch/arm/mach-omap2/board-n800.c | 2 +-
drivers/input/keyboard/lm8323.c | 32 +++++++++++++++++++-------------
include/linux/i2c/lm8323.h | 2 --
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index efcb25d..ae85c2c 100644
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -642,7 +642,7 @@ static struct i2c_board_info __initdata n800_i2c_board_info_1[] = {
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),
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index e793ae7..72bb587 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -150,7 +150,6 @@ struct lm8323_chip {
struct i2c_client *client;
struct work_struct work;
struct input_dev *idev;
- int irq;
unsigned kp_enabled : 1;
unsigned pm_suspend : 1;
unsigned keys_down;
@@ -755,9 +754,6 @@ static int lm8323_probe(struct i2c_client *client,
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);
@@ -765,11 +761,11 @@ static int lm8323_probe(struct i2c_client *client,
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);
goto fail6;
}
- 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);
@@ -802,7 +798,8 @@ static int lm8323_probe(struct i2c_client *client,
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;
}
@@ -812,7 +809,7 @@ static int lm8323_probe(struct i2c_client *client,
fail8:
device_remove_file(&client->dev, &dev_attr_disable_kp);
fail7:
- free_irq(lm->irq, lm);
+ free_irq(client->irq, lm);
fail6:
if (lm->pwm3.enabled)
led_classdev_unregister(&lm->pwm3.cdev);
@@ -832,8 +829,17 @@ static int lm8323_remove(struct i2c_client *client)
{
struct lm8323_chip *lm = i2c_get_clientdata(client);
- free_irq(lm->irq, lm);
+ 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);
+ 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);
return 0;
}
@@ -846,8 +852,8 @@ static int lm8323_suspend(struct i2c_client *client, pm_message_t mesg)
{
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;
@@ -878,8 +884,8 @@ static int lm8323_resume(struct i2c_client *client)
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);
return 0;
}
diff --git a/include/linux/i2c/lm8323.h b/include/linux/i2c/lm8323.h
index 5cb09ab..17d6b33 100644
--- a/include/linux/i2c/lm8323.h
+++ b/include/linux/i2c/lm8323.h
@@ -17,8 +17,6 @@
#define LM8323_KEYMAP_SIZE (0x7f + 1)
struct lm8323_platform_data {
- u16 irq_gpio;
-
int debounce_time; /* Time to watch for key bouncing, in ms. */
int active_time; /* Idle time until sleep, in ms. */
--
1.5.3.6
