From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27E1F53D0C4; Wed, 9 Sep 2026 11:13:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788952395; cv=none; b=NqmqfW1mKE2ImqRoaaMFtzADVuPOE6M/1daD2HSzwTlTL2KxDazpmhLdBVhODQ8xPDVRyczmapqN83FhY+/zsZ3ghqAPKoL6r0hPJkYKil2IwMz8L2ECCwa+3s4+xVgE5IZWxqmF7V3C0ZQQ4eOM9URovoEQroZmhHmT/Zoft1k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788952395; c=relaxed/simple; bh=Lp1BzneSVJSqGUrRRhL5yj3mUFPLY1tgBLQ0lwaScS4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=C7T9nuwbosDgOISH+et9OyPLbEqdY7QeWJoi/ztSVqZDqz2GtTpA/zScjsTYVgridIR3sNxGQUfvohEODu7E0MExWw1BVF6FVUNs7AgHzNSfpjve8whilxkssomxaP5HKmcCHFE7nBqGPaJdfA7QV26f/ycj6vz2igUsPIfd1Lc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ai/AvUcX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ai/AvUcX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C08141F00A3F; Wed, 9 Sep 2026 11:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788952388; bh=G8G2dhlJPLx8pBD+kOQpUMViNYkYx46qc9qc2gMu0lo=; h=From:To:Cc:Subject:Date; b=ai/AvUcXbEHvDGS6G3Gh51u3ur+Wv8EHaQSlUEcBAuVnU+vXR8my8rriFOXkw2eSs /EnMu/6Fr99K82BsTaOPPci9q0Bkxodr1brfUy7r+H9gRUUz29qwpND5CDcBS9Y6jG vT3xDggJ2+psbF9AfyVz+oqGeSPQmgj21XMOdb09cHi9HRqyEM0yHP0KBQtN6MEbvY 0uPPTvU7nG1rgbE195VhPMn7gw7C5ykr4apHhuBxeRiRn9gK0QoYx/zDehOVPPVpGg qxGUghoY4hqYalA0XdpnM6tL4xkvA40iG+iY9rx6D441tDAHns98+/i30pTV8Cmfyt +KPwzECKq9Cyg== From: Lee Jones To: lee@kernel.org, Ping Cheng , Jason Gerecke , Jiri Kosina , Benjamin Tissoires , Aaron Skomra , Dmitry Torokhov , Peter Hutterer , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Subject: [PATCH v10 1/5] HID: wacom: Use hdev->product in wacom_setup_touch_input_capabilities Date: Wed, 9 Sep 2026 11:12:23 +0000 Message-ID: X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the lookup-dependent 'wacom_wac->shared->touch->product' references with 'hdev->product' inside wacom_setup_touch_input_capabilities() since 'hdev' is already available (via container_of) and represents the touch device itself. Cc: stable@vger.kernel.org Signed-off-by: Lee Jones --- v7 -> v8: New patch v8 -> v9: No change v9 -> v10: No change drivers/hid/wacom_wac.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 8feb8027be95..7cf2b4de52be 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -3966,8 +3966,8 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev, int wacom_setup_touch_input_capabilities(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { + struct hid_device *hdev = container_of(wacom_wac, struct wacom, wacom_wac)->hdev; struct wacom_features *features = &wacom_wac->features; - if (!(features->device_type & WACOM_DEVICETYPE_TOUCH)) return -ENODEV; @@ -3976,9 +3976,11 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev, else __set_bit(INPUT_PROP_POINTER, input_dev->propbit); - if (features->type == HID_GENERIC) + if (features->type == HID_GENERIC) { + hid_dbg(hdev, "generic touch setup\n"); /* setup has already been done */ return 0; + } input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); __set_bit(BTN_TOUCH, input_dev->keybit); @@ -4010,19 +4012,17 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev, input_dev->evbit[0] |= BIT_MASK(EV_SW); __set_bit(SW_MUTE_DEVICE, input_dev->swbit); - if (wacom_wac->shared->touch->product == 0x361) { + if (hdev->product == 0x361) { input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 12440, 4, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 8640, 4, 0); - } - else if (wacom_wac->shared->touch->product == 0x360) { + } else if (hdev->product == 0x360) { input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 8960, 4, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 5920, 4, 0); - } - else if (wacom_wac->shared->touch->product == 0x393) { + } else if (hdev->product == 0x393) { input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 6400, 4, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y, @@ -4052,8 +4052,8 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev, fallthrough; case WACOM_27QHDT: - if (wacom_wac->shared->touch->product == 0x32C || - wacom_wac->shared->touch->product == 0xF6) { + if (hdev->product == 0x32C || + hdev->product == 0xF6) { input_dev->evbit[0] |= BIT_MASK(EV_SW); __set_bit(SW_MUTE_DEVICE, input_dev->swbit); wacom_wac->has_mute_touch_switch = true; -- 2.55.0.979.g7e5102b832-goog