Skip to content

Commit bd008ac

Browse files
jwrdegoedeJiri Kosina
authored andcommitted
HID: i2c-hid: Remove I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk
Re-trying the power-on command on failure on all devices should not be a problem, drop the I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk and simply retry power-on on all devices. Reviewed-by: Douglas Anderson <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 7bcf9eb commit bd008ac

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/hid/i2c-hid/i2c-hid-core.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "i2c-hid.h"
4545

4646
/* quirks to control the device */
47-
#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)
4847
#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1)
4948
#define I2C_HID_QUIRK_BOGUS_IRQ BIT(4)
5049
#define I2C_HID_QUIRK_RESET_ON_RESUME BIT(5)
@@ -120,8 +119,6 @@ static const struct i2c_hid_quirks {
120119
__u16 idProduct;
121120
__u32 quirks;
122121
} i2c_hid_quirks[] = {
123-
{ USB_VENDOR_ID_WEIDA, HID_ANY_ID,
124-
I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
125122
{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
126123
I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
127124
{ I2C_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_VOYO_WINPAD_A15,
@@ -395,8 +392,7 @@ static int i2c_hid_set_power(struct i2c_hid *ihid, int power_state)
395392
* The call will get a return value (EREMOTEIO) but device will be
396393
* triggered and activated. After that, it goes like a normal device.
397394
*/
398-
if (power_state == I2C_HID_PWR_ON &&
399-
ihid->quirks & I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV) {
395+
if (power_state == I2C_HID_PWR_ON) {
400396
ret = i2c_hid_set_power_command(ihid, I2C_HID_PWR_ON);
401397

402398
/* Device was already activated */

0 commit comments

Comments
 (0)