| Message ID | 1484761614-12225-25-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Jan 18, 2017 at 09:46:45AM -0800, Guenter Roeck wrote: > There is no call to i2c_get_clientdata() or dev_get_drvdata(). > Drop the unnecessary call to i2c_set_clientdata(). Kept just this part and applied. > > This conversion was done automatically with coccinelle using the > following semantic patches. The semantic patches and the scripts > used to generate this commit log are available at > https://github.com/groeck/coccinelle-patches > > - Replace 'goto l; ... l: return e;' with 'return e;' > - Drop i2c_set_clientdata() > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/input/touchscreen/ar1021_i2c.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/touchscreen/ar1021_i2c.c b/drivers/input/touchscreen/ar1021_i2c.c > index 71b5a634cf6d..b289eca2b797 100644 > --- a/drivers/input/touchscreen/ar1021_i2c.c > +++ b/drivers/input/touchscreen/ar1021_i2c.c > @@ -35,11 +35,11 @@ static irqreturn_t ar1021_i2c_irq(int irq, void *dev_id) > retval = i2c_master_recv(ar1021->client, > ar1021->data, sizeof(ar1021->data)); > if (retval != sizeof(ar1021->data)) > - goto out; > + return IRQ_HANDLED; > > /* sync bit set ? */ > if ((data[0] & 0x80) == 0) > - goto out; > + return IRQ_HANDLED; > > button = data[0] & BIT(0); > x = ((data[2] & 0x1f) << 7) | (data[1] & 0x7f); > @@ -50,7 +50,6 @@ static irqreturn_t ar1021_i2c_irq(int irq, void *dev_id) > input_report_key(input, BTN_TOUCH, button); > input_sync(input); > > -out: > return IRQ_HANDLED; > } > > @@ -127,7 +126,6 @@ static int ar1021_i2c_probe(struct i2c_client *client, > return error; > } > > - i2c_set_clientdata(client, ar1021); > return 0; > } > > -- > 2.7.4 >
diff --git a/drivers/input/touchscreen/ar1021_i2c.c b/drivers/input/touchscreen/ar1021_i2c.c index 71b5a634cf6d..b289eca2b797 100644 --- a/drivers/input/touchscreen/ar1021_i2c.c +++ b/drivers/input/touchscreen/ar1021_i2c.c @@ -35,11 +35,11 @@ static irqreturn_t ar1021_i2c_irq(int irq, void *dev_id) retval = i2c_master_recv(ar1021->client, ar1021->data, sizeof(ar1021->data)); if (retval != sizeof(ar1021->data)) - goto out; + return IRQ_HANDLED; /* sync bit set ? */ if ((data[0] & 0x80) == 0) - goto out; + return IRQ_HANDLED; button = data[0] & BIT(0); x = ((data[2] & 0x1f) << 7) | (data[1] & 0x7f); @@ -50,7 +50,6 @@ static irqreturn_t ar1021_i2c_irq(int irq, void *dev_id) input_report_key(input, BTN_TOUCH, button); input_sync(input); -out: return IRQ_HANDLED; } @@ -127,7 +126,6 @@ static int ar1021_i2c_probe(struct i2c_client *client, return error; } - i2c_set_clientdata(client, ar1021); return 0; }
There is no call to i2c_get_clientdata() or dev_get_drvdata(). Drop the unnecessary call to i2c_set_clientdata(). This conversion was done automatically with coccinelle using the following semantic patches. The semantic patches and the scripts used to generate this commit log are available at https://github.com/groeck/coccinelle-patches - Replace 'goto l; ... l: return e;' with 'return e;' - Drop i2c_set_clientdata() Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/input/touchscreen/ar1021_i2c.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)