From: Hans de Goede <hdegoede@redhat.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
Douglas Anderson <dianders@chromium.org>,
Julian Sax <jsbc@gmx.de>,
ahormann@gmx.net, Bruno Jesus <bruno.fl.jesus@gmail.com>,
Dietrich <enaut.w@googlemail.com>,
kloxdami@yahoo.com, Tim Aldridge <taldridge@mac.com>,
Rene Wagner <redhatbugzilla@callerid.de>,
Federico Ricchiuto <fed.ricchiuto@gmail.com>,
linux-input@vger.kernel.org
Subject: [PATCH 6/7] HID: i2c-hid: Remove I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk
Date: Sat, 4 Nov 2023 12:17:42 +0100 [thread overview]
Message-ID: <20231104111743.14668-7-hdegoede@redhat.com> (raw)
In-Reply-To: <20231104111743.14668-1-hdegoede@redhat.com>
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.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/hid/i2c-hid/i2c-hid-core.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index df5577fc73c5..ff2659bf5e57 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -44,7 +44,6 @@
#include "i2c-hid.h"
/* quirks to control the device */
-#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)
#define I2C_HID_QUIRK_BOGUS_IRQ BIT(4)
#define I2C_HID_QUIRK_RESET_ON_RESUME BIT(5)
#define I2C_HID_QUIRK_BAD_INPUT_SIZE BIT(6)
@@ -119,8 +118,6 @@ static const struct i2c_hid_quirks {
__u16 idProduct;
__u32 quirks;
} i2c_hid_quirks[] = {
- { USB_VENDOR_ID_WEIDA, HID_ANY_ID,
- I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
{ USB_VENDOR_ID_ALPS_JP, HID_ANY_ID,
I2C_HID_QUIRK_RESET_ON_RESUME },
{ I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393,
@@ -388,8 +385,7 @@ static int i2c_hid_set_power(struct i2c_hid *ihid, int power_state)
* The call will get a return value (EREMOTEIO) but device will be
* triggered and activated. After that, it goes like a normal device.
*/
- if (power_state == I2C_HID_PWR_ON &&
- ihid->quirks & I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV) {
+ if (power_state == I2C_HID_PWR_ON) {
ret = i2c_hid_set_power_command(ihid, I2C_HID_PWR_ON);
/* Device was already activated */
--
2.41.0
next prev parent reply other threads:[~2023-11-04 11:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-04 11:17 [PATCH 0/7] HID: i2c-hid: Rework wait for reset to match Windows Hans de Goede
2023-11-04 11:17 ` [PATCH 1/7] HID: i2c-hid: Fold i2c_hid_execute_reset() into i2c_hid_hwreset() Hans de Goede
2023-11-06 18:50 ` Doug Anderson
2023-11-17 19:34 ` Hans de Goede
2023-11-04 11:17 ` [PATCH 2/7] HID: i2c-hid: Split i2c_hid_hwreset() in start() and finish() functions Hans de Goede
2023-11-06 18:53 ` Doug Anderson
2023-11-17 19:37 ` Hans de Goede
2023-11-04 11:17 ` [PATCH 3/7] HID: i2c-hid: Switch i2c_hid_parse() to goto style error handling Hans de Goede
2023-11-06 18:53 ` Doug Anderson
2023-11-04 11:17 ` [PATCH 4/7] HID: i2c-hid: Move i2c_hid_finish_hwreset() to after reading the report-descriptor Hans de Goede
2023-11-06 18:53 ` Doug Anderson
2023-11-17 19:42 ` Hans de Goede
2023-11-04 11:17 ` [PATCH 5/7] HID: i2c-hid: Remove I2C_HID_QUIRK_NO_IRQ_AFTER_RESET quirks Hans de Goede
2023-11-06 18:54 ` Doug Anderson
2023-11-04 11:17 ` Hans de Goede [this message]
2023-11-06 18:55 ` [PATCH 6/7] HID: i2c-hid: Remove I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk Doug Anderson
2023-11-04 11:17 ` [PATCH 7/7] HID: i2c-hid: Renumber I2C_HID_QUIRK_ defines Hans de Goede
2023-11-06 18:55 ` Doug Anderson
2023-11-08 20:41 ` [PATCH 0/7] HID: i2c-hid: Rework wait for reset to match Windows Julian Sax
2023-11-16 16:46 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231104111743.14668-7-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=ahormann@gmx.net \
--cc=benjamin.tissoires@redhat.com \
--cc=bruno.fl.jesus@gmail.com \
--cc=dianders@chromium.org \
--cc=enaut.w@googlemail.com \
--cc=fed.ricchiuto@gmail.com \
--cc=jikos@kernel.org \
--cc=jsbc@gmx.de \
--cc=kloxdami@yahoo.com \
--cc=linux-input@vger.kernel.org \
--cc=redhatbugzilla@callerid.de \
--cc=taldridge@mac.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).