evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HID: i2c-hid: remove extra .irq field in struct i2c_hid

Browse source 
There is no point in keeping the irq in i2c_hid as it's already
there in client.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Benjamin Tissoires 2012-12-05 15:02:55 +01:00 • committed by Jiri Kosina
parent 29b45787d1
commit 8a1bbb5319
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/hid/i2c-hid/i2c-hid.c
View file

@ -135,8 +135,6 @@ struct i2c_hid {
unsigned long flags; /* device flags */ unsigned long flags; /* device flags */
int irq; /* the interrupt line irq */
wait_queue_head_t wait; /* For waiting the interrupt */ wait_queue_head_t wait; /* For waiting the interrupt */
}; };
@ -736,8 +734,6 @@ static int __devinit i2c_hid_init_irq(struct i2c_client *client)
return ret; return ret;
} }
ihid->irq = client->irq;
return 0; return 0;
} }
@ -851,7 +847,7 @@ static int __devinit i2c_hid_probe(struct i2c_client *client,
hid = hid_allocate_device(); hid = hid_allocate_device();
if (IS_ERR(hid)) { if (IS_ERR(hid)) {
ret = PTR_ERR(hid); ret = PTR_ERR(hid);
goto err; goto err_irq;
} }
ihid->hid = hid; ihid->hid = hid;
@ -881,10 +877,10 @@ static int __devinit i2c_hid_probe(struct i2c_client *client,
err_mem_free: err_mem_free:
hid_destroy_device(hid); hid_destroy_device(hid);
err: err_irq:
if (ihid->irq) free_irq(client->irq, ihid);
free_irq(ihid->irq, ihid);
err:
i2c_hid_free_buffers(ihid); i2c_hid_free_buffers(ihid);
kfree(ihid); kfree(ihid);
return ret; return ret;
@ -912,10 +908,9 @@ static int __devexit i2c_hid_remove(struct i2c_client *client)
static int i2c_hid_suspend(struct device *dev) static int i2c_hid_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct i2c_hid *ihid = i2c_get_clientdata(client);
if (device_may_wakeup(&client->dev)) if (device_may_wakeup(&client->dev))
enable_irq_wake(ihid->irq); enable_irq_wake(client->irq);
/* Save some power */ /* Save some power */
i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);