From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <bentiss@kernel.org>,
Gideon Heinz <gideonheinz02@gmail.com>
Cc: "Filipe Laíns" <lains@riseup.net>,
"Bastien Nocera" <hadess@hadess.net>,
"Hans de Goede" <hansg@kernel.org>,
"Edwin Velds" <e.velds@gmail.com>,
"Stuart Hayhurst" <stuart.a.hayhurst@gmail.com>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 10/18] HID: logitech-hidpp: clean up G920 force-feedback helpers
Date: Fri, 20 Nov 2026 00:44:01 -0800 [thread overview]
Message-ID: <20261120-hid-logitech-hidpp-next-v3-10-ba39242d4336@gmail.com> (raw)
In-Reply-To: <20261120-hid-logitech-hidpp-next-v3-0-ba39242d4336@gmail.com>
Perform several minor cleanups across the G920 force-feedback support:
- In hidpp_ff_init(), obtain the firmware version directly in a single
expression from the USB device descriptor, drop the redundant
hid_is_usb() check on the already-matched G920 device, and remove
unused local variables.
- In hidpp_ff_upload_effect(), remove the dead force calculation in the
periodic effect upload case where magnitude is written directly.
- Zero-initialize stack parameter buffers in effect upload, playback,
autocenter, and gain helpers so unused parameter bytes sent over USB
are always clean zeroes.
- Drop the write-only gain field from struct g920_data, remove the
unused HIDPP_FF_GET_GLOBAL_GAINS query at probe time, and remove the
gain cache update from the work handler.
Tested-by: Gideon Heinz <gideonheinz02@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/hid/hid-logitech-hidpp.c | 43 +++++-----------------------------------
1 file changed, 5 insertions(+), 38 deletions(-)
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index cfd13ca93b2a..54e7ee824063 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -2315,7 +2315,6 @@ static void hidpp_touchpad_raw_xy_event(struct hidpp_device *hidpp_dev,
#define HIDPP_FF_DESTROY_EFFECT 0x41
#define HIDPP_FF_GET_APERTURE 0x51
#define HIDPP_FF_SET_APERTURE 0x61
-#define HIDPP_FF_GET_GLOBAL_GAINS 0x71
#define HIDPP_FF_SET_GLOBAL_GAINS 0x81
#define HIDPP_FF_EFFECT_STATE_GET 0x00
@@ -2354,7 +2353,6 @@ struct g920_data {
u8 feature_index;
u8 slot_autocenter;
u8 num_effects;
- u16 gain;
u16 range;
};
@@ -2417,8 +2415,6 @@ static void hidpp_ff_work_handler(struct work_struct *w)
&response);
if (ret)
hid_err(data->hidpp->hid_dev, "Failed to send command to device!\n");
- else if (wd->command == HIDPP_FF_SET_GLOBAL_GAINS)
- g920->gain = (wd->params[0] << 8) + wd->params[1];
atomic_dec(&data->workqueue_size);
kfree(wd);
@@ -2458,7 +2454,7 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
struct hid_device *hid = hidpp->hid_dev;
struct g920_data *g920 = hidpp->private_data;
struct hidpp_report response;
- u8 params[20];
+ u8 params[20] = {};
u8 size;
int force, error;
@@ -2515,7 +2511,6 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
effect->u.periodic.waveform);
return -EINVAL;
}
- force = (effect->u.periodic.magnitude * fixp_sin16((effect->direction * 360) >> 16)) >> 15;
params[6] = effect->u.periodic.magnitude >> 8;
params[7] = effect->u.periodic.magnitude & 255;
params[8] = effect->u.periodic.offset >> 8;
@@ -2622,7 +2617,7 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
static int hidpp_ff_playback(struct input_dev *dev, int effect_id, int value)
{
struct hidpp_ff_private_data *data = dev->ff->private;
- u8 params[2];
+ u8 params[2] = {};
params[0] = data->slots[effect_id];
if (!dev->ready || !params[0])
@@ -2667,22 +2662,18 @@ static void hidpp_ff_set_autocenter(struct input_dev *dev, u16 magnitude)
{
struct hidpp_ff_private_data *data = dev->ff->private;
struct g920_data *g920 = data->hidpp->private_data;
- u8 params[HIDPP_AUTOCENTER_PARAMS_LENGTH];
+ u8 params[HIDPP_AUTOCENTER_PARAMS_LENGTH] = {};
dbg_hid("Setting autocenter to %d.\n", magnitude);
/* start a standard spring effect */
params[0] = g920->slot_autocenter;
params[1] = HIDPP_FF_EFFECT_SPRING | HIDPP_FF_EFFECT_AUTOSTART;
- /* zero delay and duration */
- params[2] = params[3] = params[4] = params[5] = 0;
/* set coeff to 25% of saturation */
params[8] = params[14] = magnitude >> 11;
params[9] = params[15] = (magnitude >> 3) & 255;
params[6] = params[16] = magnitude >> 9;
params[7] = params[17] = (magnitude >> 1) & 255;
- /* zero deadband and center */
- params[10] = params[11] = params[12] = params[13] = 0;
hidpp_ff_queue_work(data, HIDPP_FF_DOWNLOAD_EFFECT, params, ARRAY_SIZE(params));
}
@@ -2690,14 +2681,12 @@ static void hidpp_ff_set_autocenter(struct input_dev *dev, u16 magnitude)
static void hidpp_ff_set_gain(struct input_dev *dev, u16 gain)
{
struct hidpp_ff_private_data *data = dev->ff->private;
- u8 params[4];
+ u8 params[4] = {};
dbg_hid("Setting gain to %d.\n", gain);
params[0] = gain >> 8;
params[1] = gain & 255;
- params[2] = 0; /* no boost */
- params[3] = 0;
hidpp_ff_queue_work(data, HIDPP_FF_SET_GLOBAL_GAINS, params, ARRAY_SIZE(params));
}
@@ -2813,17 +2802,10 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, struct input_dev *dev)
{
struct hid_device *hid = hidpp->hid_dev;
struct g920_data *g920 = hidpp->private_data;
- struct usb_device_descriptor *udesc;
- u16 bcdDevice;
struct ff_device *ff;
int error, j, num_slots = g920->num_effects;
u8 version;
- if (!hid_is_usb(hid)) {
- hid_err(hid, "device is not USB\n");
- return -ENODEV;
- }
-
struct hidpp_ff_private_data *data __free(kfree) =
kzalloc_flex(*data, slots, num_slots);
if (!data)
@@ -2840,9 +2822,7 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, struct input_dev *dev)
return -ENOMEM;
/* Get firmware release */
- udesc = &(hid_to_usb_dev(hid)->descriptor);
- bcdDevice = le16_to_cpu(udesc->bcdDevice);
- version = bcdDevice & 255;
+ version = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.bcdDevice) & 0xff;
/* Set supported force feedback capabilities */
for (j = 0; hidpp_ff_effects[j] >= 0; j++)
@@ -3448,19 +3428,6 @@ static int g920_get_config(struct hidpp_device *hidpp)
data.range = ret ?
900 : get_unaligned_be16(&response.fap.params[0]);
- /* Read the current gain values */
- ret = hidpp_send_fap_command_sync(hidpp, data.feature_index,
- HIDPP_FF_GET_GLOBAL_GAINS,
- NULL, 0,
- &response);
- if (ret)
- hid_warn(hidpp->hid_dev,
- "Failed to read gain values from device!\n");
- data.gain = ret ?
- 0xffff : get_unaligned_be16(&response.fap.params[0]);
-
- /* ignore boost value at response.fap.params[2] */
-
ret = g920_ff_set_autocenter(hidpp, &data);
if (ret)
return ret;
--
2.56.1.750.gf70dc682cf-goog
next prev parent reply other threads:[~2026-11-20 8:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 8:43 [PATCH v3 00/18] HID: logitech-hidpp: G920 force-feedback rework and driver cleanups Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 01/18] HID: logitech-hidpp: keep connect work disabled until hid_connect() completes Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 02/18] HID: logitech-hidpp: preserve transport error codes in __hidpp_send_report() Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 03/18] HID: logitech-hidpp: return negative error codes from hidpp_send_message_sync() Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 04/18] HID: logitech-hidpp: rework G920 force-feedback initialization Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 05/18] HID: logitech-hidpp: use sysfs_emit() in hidpp_ff_range_show() Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 06/18] HID: logitech-hidpp: manage G920 range sysfs attribute via dev_groups Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 07/18] HID: logitech-hidpp: execute G920 range sysfs store synchronously Dmitry Torokhov
2026-11-20 8:43 ` [PATCH v3 08/18] HID: logitech-hidpp: index G920 force-feedback slots by effect ID Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 09/18] HID: logitech-hidpp: execute G920 effect upload and erase synchronously Dmitry Torokhov
2026-11-20 8:44 ` Dmitry Torokhov [this message]
2026-11-20 8:44 ` [PATCH v3 11/18] HID: logitech-hidpp: use unaligned accessors for multi-byte values Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 12/18] HID: logitech-hidpp: store device serial as a byte array Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 13/18] HID: logitech-hidpp: use guard() for send_mutex Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 14/18] HID: logitech-hidpp: use __free(kfree) for temporary allocations Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 15/18] HID: logitech-hidpp: use alloc_ordered_workqueue() for FF queue Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 16/18] HID: logitech-hidpp: manage send_mutex with devm_mutex_init() Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 17/18] HID: logitech-hidpp: manage ps_attribute_group with devm_device_add_group() Dmitry Torokhov
2026-11-20 8:44 ` [PATCH v3 18/18] HID: logitech-hidpp: remove unused kfifo and clean up minor helpers Dmitry Torokhov
2026-11-20 12:14 ` [PATCH v3 00/18] HID: logitech-hidpp: G920 force-feedback rework and driver cleanups Jiri Kosina
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=20261120-hid-logitech-hidpp-next-v3-10-ba39242d4336@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andrew.smirnov@gmail.com \
--cc=bentiss@kernel.org \
--cc=e.velds@gmail.com \
--cc=gideonheinz02@gmail.com \
--cc=hadess@hadess.net \
--cc=hansg@kernel.org \
--cc=jikos@kernel.org \
--cc=lains@riseup.net \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stuart.a.hayhurst@gmail.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
all inboxes | Powered by JetHome®