From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f169.google.com (mail-dy1-f169.google.com [74.125.82.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2198C38330E for ; Sat, 17 Oct 2026 01:40:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792201222; cv=none; b=dC4fJfQk2AgM0f5sWwf+UiMyDmNvkJjG/DfVTTdpW8tC6X/ZDztDrK9B2qCVN7bdbEe+jQxMX4Rn/znCWmprndVJT+EaA72qxvHEl2ZksCAvpUWtdtvEWSdCAQXdSuevmWb7H/EIDKGEac2F3ZTZ4+sPgCYKh1UXnecuQyq1DhQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792201222; c=relaxed/simple; bh=0g1XdcSnszgfnBrc//3ptadxUHrvJPF2TUo0vFKiSfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i06ltPaw3pWbEpuCsuN4naGrky9rttgvBQW08dNP3y6JmJdQY6oLAXGFYY9qJTQiFGolMnV1iJDW9ZpCVyN/TnEoI3MuHzha6gUQlyoHijEmH0+cQKHYbbnf1wGcEKQ68ul62ct1XvROKf/TJ5heP+WnIf7+SMNhiWaaYRKdlsw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gJYD1MZw; arc=none smtp.client-ip=74.125.82.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gJYD1MZw" Received: by mail-dy1-f169.google.com with SMTP id 5a478bee46e88-3514b90bb89so1171154eec.1 for ; Fri, 16 Oct 2026 18:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792201217; x=1792806017; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gtv4kR00wPafjiBbutxxISjIjF/YcaYhJwVNGZqRIgU=; b=gJYD1MZwyjacBxti3vpect+FSWyNBkNDyjc+MIv9ftqMD4+tBr6pgh+tBgiYcSN3E5 hW3rgatqt2gFlAuj2i8v97Bibfqdw9oJhM2GNuwOYqQvwvsl/K6pz0Yb3twCLsSYyWjr WXlFctnmoN3nn8MGdKeiXesk7oAsQPOhY2+KuxFR5Hi679N9mkU2EY1idc/fx7uRReM2 ArAoNAO1ekSgDAcwnODPVgdiZMup2/qKGr1p9O+QNiqVkPS8JM4fXQnlluFa+997Dj/a pOY6iKCqVldMwpkfmfe0ByMQZHO1XYbm6ln8x9Yzs/2QIjcjSRvvPCwfU0isxiDmR25w 2VTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792201217; x=1792806017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=gtv4kR00wPafjiBbutxxISjIjF/YcaYhJwVNGZqRIgU=; b=wHS6Nc4iWneKIoKObtm2cjqtDL6M8krMyPPm2d5YsrQIUJoE3DZ31a/R1wVT7wWila qQg71BXGdpoOq8GV9ai6BTIXkMaSU2YoMEQj90KZ87QJunkxB+BoxaJ7bi7OxKStHHcK 8wXiWBbjuKryl7eoDnHbXgzahXMushpOaIa7iq37HVbypOhzpsqplJSBaoTRJnpemUFQ bBVJoQz0Mwtf+NAwD+CcB/J8FRgIywIRTsleidTPWQiRIDzm+cBt/xoqC3yaoPj2eTVh jfV2Bm+CRHQbr5n0klha6MOuKOpM9h75/ulDheldzVk0E96JAVuzIhRPatNyPiLXAg8b PEJw== X-Forwarded-Encrypted: i=1; AKwUvBzy9eQfIC6dvLiYK6p0HxKa2IqiI9e873LPHkkhL2FGboN7W2a4eJgcAdAu1v1rKJvOKIK8MrKJTKHA3w==@vger.kernel.org X-Gm-Message-State: AFq9FYLmtEqhuufInapsBBzXpXZmprp9++nplnKvPRbhAYmlb5apQTDv Yr0BtlBUKxNgTLBWwS+/MINLDFN0BgzUd3RhjWGZ0tk6WK2LqbZKLSIF X-Gm-Gg: AYBFou3clwWCDfQUjFfayet2XurRxslBYU+eXnaldAHPuL8fUbgNmFeWWv6qm9UhtS5 KQ5qQjzs4IJhp5eRIhp5xlLXC3NxJLpmKRfnvJrhz1j+v88KhWd00crzCX2rAgPjvPdBJrGOKwj dVu61/ysKo4GFNeVlS3HWEWZBpT6DyfR2B2OQO4PVyA1L3ZlH+wkN/mQBKTKvIC0VeiG6FbUu0L i/NY0Xa779mardS0i8l1AGPuy+KpLJ48U6an377+cGFx51uvmIKim+Um0ANR74zpA7RQEkoYoUe zn4OS8wDO3UekmsP25fVob9rCBYJdDpQ5sU2YLPEl3Q55C8oSV61a7+IQJ5UBV8ARubiLtLQPuD roZyXWjcqMXIKQS8uWMxuuVKNyvweZeFYxFTxVTV3t+hX0bABUlhT/QDB9vyr+pOfnHq8Dl5SAi IukhZJm/s9qsrpbqKTsmpFu0a1d36T2Tgy3f521hSEpzw/cHYtTr3nAKv84qvRPRZqpXR5e3/yS TxEnCQHORO81cd96dd7QZD+RpwghaeVXvBDIWL8UycLlc6/DZy1oGRBTJ3Bna1W0q8Zd8qGs6eI dE731MTWUw== X-Received: by 2002:a05:7022:5f1a:b0:17c:2de6:9795 with SMTP id a92af1059eb24-185118edaeamr1921007c88.9.1792201216961; Fri, 16 Oct 2026 18:40:16 -0700 (PDT) Received: from lappy.taila8a9bd.ts.net (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1831acba710sm12128429c88.13.2026.10.16.18.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2026 18:40:15 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , "Derek J . Clark" , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@lists.opengamingcollective.org, stable@vger.kernel.org Subject: [PATCH v2 10/11] HID: hid-lenovo-go-s: Use devm_kzalloc for drvdata Date: Fri, 16 Oct 2026 18:39:55 -0700 Message-ID: <20261017013956.2440130-11-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261017013956.2440130-1-derekjohn.clark@gmail.com> References: <20261017013956.2440130-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Changes drvdata from static global to devm allocation per device. Also fix stale references to the setup work function name in the memory barrier pairing comments. Fixes: a23f3497bf208c59ad ("HID: hid-lenovo-go-s: Add Lenovo Legion Go S Series HID Driver") Cc: stable@vger.kernel.org Signed-off-by: Derek J. Clark --- drivers/hid/hid-lenovo-go-s.c | 532 ++++++++++++++++++++-------------- 1 file changed, 315 insertions(+), 217 deletions(-) diff --git a/drivers/hid/hid-lenovo-go-s.c b/drivers/hid/hid-lenovo-go-s.c index 2e938dd5e77c..1a2b28e1bed1 100644 --- a/drivers/hid/hid-lenovo-go-s.c +++ b/drivers/hid/hid-lenovo-go-s.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,7 @@ #define GO_S_CFG_INTF_IN 0x84 #define GO_S_PACKET_SIZE 64 -static struct gos_cfg_drvdata { +struct gos_cfg_drvdata { /* MCU General Variables */ struct completion send_cmd_complete; struct delayed_work gos_cfg_setup; @@ -68,7 +69,7 @@ static struct gos_cfg_drvdata { u8 rgb_speed; u8 rgb_mode; u8 rgb_en; -} drvdata; +}; struct gos_cfg_attr { u8 index; @@ -244,56 +245,57 @@ static const char *const imu_manufacturer_text[] = { [IMU_ST] = "ST", }; -static int hid_gos_version_event(u8 *data) +static int hid_gos_version_event(struct gos_cfg_drvdata *drvdata, u8 *data) { struct version_report *ver_rep = (struct version_report *)data; - drvdata.hdev->firmware_version = get_unaligned_le32(&ver_rep->version); + drvdata->hdev->firmware_version = get_unaligned_le32(&ver_rep->version); return 0; } -static int hid_gos_mcu_id_event(struct command_report *cmd_rep) +static int hid_gos_mcu_id_event(struct gos_cfg_drvdata *drvdata, struct command_report *cmd_rep) { - drvdata.mcu_id[0] = cmd_rep->sub_cmd; - memcpy(&drvdata.mcu_id[1], cmd_rep->data, 11); + drvdata->mcu_id[0] = cmd_rep->sub_cmd; + memcpy(&drvdata->mcu_id[1], cmd_rep->data, 11); return 0; } -static int hid_gos_gamepad_cfg_event(struct command_report *cmd_rep) +static int hid_gos_gamepad_cfg_event(struct gos_cfg_drvdata *drvdata, + struct command_report *cmd_rep) { int ret = 0; switch (cmd_rep->sub_cmd) { case FEATURE_GAMEPAD_MODE: - drvdata.gp_mode = cmd_rep->data[0]; + drvdata->gp_mode = cmd_rep->data[0]; break; case FEATURE_AUTO_SLEEP_TIME: - drvdata.gp_auto_sleep_time = cmd_rep->data[0]; + drvdata->gp_auto_sleep_time = cmd_rep->data[0]; break; case FEATURE_IMU_BYPASS: - drvdata.imu_bypass_en = cmd_rep->data[0]; + drvdata->imu_bypass_en = cmd_rep->data[0]; break; case FEATURE_RGB_ENABLE: - drvdata.rgb_en = cmd_rep->data[0]; + drvdata->rgb_en = cmd_rep->data[0]; break; case FEATURE_IMU_ENABLE: - drvdata.imu_sensor_en = cmd_rep->data[0]; + drvdata->imu_sensor_en = cmd_rep->data[0]; break; case FEATURE_TOUCHPAD_ENABLE: - drvdata.tp_en = cmd_rep->data[0]; + drvdata->tp_en = cmd_rep->data[0]; break; case FEATURE_OS_MODE: - drvdata.os_mode = cmd_rep->data[0]; + drvdata->os_mode = cmd_rep->data[0]; break; case FEATURE_POLL_RATE: - drvdata.gp_poll_rate = cmd_rep->data[0]; + drvdata->gp_poll_rate = cmd_rep->data[0]; break; case FEATURE_DPAD_MODE: - drvdata.gp_dpad_mode = cmd_rep->data[0]; + drvdata->gp_dpad_mode = cmd_rep->data[0]; break; case FEATURE_MOUSE_WHEEL_STEP: - drvdata.mouse_step = cmd_rep->data[0]; + drvdata->mouse_step = cmd_rep->data[0]; break; default: ret = -EINVAL; @@ -303,16 +305,16 @@ static int hid_gos_gamepad_cfg_event(struct command_report *cmd_rep) return ret; } -static int hid_gos_touchpad_event(struct command_report *cmd_rep) +static int hid_gos_touchpad_event(struct gos_cfg_drvdata *drvdata, struct command_report *cmd_rep) { int ret = 0; switch (cmd_rep->sub_cmd) { case CFG_LINUX_MODE: - drvdata.tp_linux_mode = cmd_rep->data[0]; + drvdata->tp_linux_mode = cmd_rep->data[0]; break; case CFG_WINDOWS_MODE: - drvdata.tp_windows_mode = cmd_rep->data[0]; + drvdata->tp_windows_mode = cmd_rep->data[0]; break; default: ret = -EINVAL; @@ -322,21 +324,21 @@ static int hid_gos_touchpad_event(struct command_report *cmd_rep) return ret; } -static int hid_gos_pl_test_event(struct command_report *cmd_rep) +static int hid_gos_pl_test_event(struct gos_cfg_drvdata *drvdata, struct command_report *cmd_rep) { int ret = 0; switch (cmd_rep->sub_cmd) { case TEST_TP_MFR: - drvdata.tp_manufacturer = cmd_rep->data[0]; + drvdata->tp_manufacturer = cmd_rep->data[0]; ret = 0; break; case TEST_IMU_MFR: - drvdata.imu_manufacturer = cmd_rep->data[0]; + drvdata->imu_manufacturer = cmd_rep->data[0]; ret = 0; break; case TEST_TP_VER: - drvdata.tp_version = cmd_rep->data[0]; + drvdata->tp_version = cmd_rep->data[0]; ret = 0; break; default: @@ -346,30 +348,30 @@ static int hid_gos_pl_test_event(struct command_report *cmd_rep) return ret; } -static int hid_gos_light_event(struct command_report *cmd_rep) +static int hid_gos_light_event(struct gos_cfg_drvdata *drvdata, struct command_report *cmd_rep) { struct led_classdev_mc *led_mc; int ret = 0; switch (cmd_rep->sub_cmd) { case LIGHT_MODE_SEL: - drvdata.rgb_mode = cmd_rep->data[0]; + drvdata->rgb_mode = cmd_rep->data[0]; ret = 0; break; case LIGHT_PROFILE_SEL: - drvdata.rgb_profile = cmd_rep->data[0]; + drvdata->rgb_profile = cmd_rep->data[0]; ret = 0; break; case USR_LIGHT_PROFILE_1: case USR_LIGHT_PROFILE_2: case USR_LIGHT_PROFILE_3: - led_mc = &drvdata.led_mc; - drvdata.rgb_effect = cmd_rep->data[0]; + led_mc = &drvdata->led_mc; + drvdata->rgb_effect = cmd_rep->data[0]; led_mc->subled_info[0].intensity = cmd_rep->data[1]; led_mc->subled_info[1].intensity = cmd_rep->data[2]; led_mc->subled_info[2].intensity = cmd_rep->data[3]; led_mc->led_cdev.brightness = cmd_rep->data[4]; - drvdata.rgb_speed = cmd_rep->data[5]; + drvdata->rgb_speed = cmd_rep->data[5]; ret = 0; break; default: @@ -402,6 +404,7 @@ static int get_endpoint_address(struct hid_device *hdev) static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); struct command_report *cmd_rep; int ep, ret; @@ -409,6 +412,9 @@ static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report, if (ep != GO_S_CFG_INTF_IN) return 0; + if (!drvdata) + return -ENODEV; + if (size != GO_S_PACKET_SIZE) return -EINVAL; @@ -416,22 +422,22 @@ static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report, switch (cmd_rep->cmd) { case GET_VERSION: - ret = hid_gos_version_event(data); + ret = hid_gos_version_event(drvdata, data); break; case GET_MCU_ID: - ret = hid_gos_mcu_id_event(cmd_rep); + ret = hid_gos_mcu_id_event(drvdata, cmd_rep); break; case GET_GAMEPAD_CFG: - ret = hid_gos_gamepad_cfg_event(cmd_rep); + ret = hid_gos_gamepad_cfg_event(drvdata, cmd_rep); break; case GET_TP_PARAM: - ret = hid_gos_touchpad_event(cmd_rep); + ret = hid_gos_touchpad_event(drvdata, cmd_rep); break; case GET_PL_TEST: - ret = hid_gos_pl_test_event(cmd_rep); + ret = hid_gos_pl_test_event(drvdata, cmd_rep); break; case GET_RGB_CFG: - ret = hid_gos_light_event(cmd_rep); + ret = hid_gos_light_event(drvdata, cmd_rep); break; case SET_GAMEPAD_CFG: case SET_RGB_CFG: @@ -445,8 +451,8 @@ static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report, dev_dbg(&hdev->dev, "Rx data as raw input report: [%*ph]\n", GO_S_PACKET_SIZE, data); - drvdata.cmd_status = ret; - complete(&drvdata.send_cmd_complete); + drvdata->cmd_status = ret; + complete(&drvdata->send_cmd_complete); return ret; } @@ -454,28 +460,32 @@ static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report, static int mcu_property_out(struct hid_device *hdev, u8 command, u8 index, u8 *data, size_t len) { + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); unsigned char *dmabuf __free(kfree) = NULL; u8 header[] = { command, index }; size_t header_size = ARRAY_SIZE(header); long t_remaining; int timeout, ret; + if (!drvdata) + return -ENODEV; + if (header_size + len > GO_S_PACKET_SIZE) return -EINVAL; - guard(mutex)(&drvdata.cfg_mutex); + guard(mutex)(&drvdata->cfg_mutex); /* * A reply to the previous command may still be in flight. Give it a * short window to arrive and be consumed before this call reinits the * completion, so a late reply can't be mistaken for this command's. */ - if (drvdata.orphan_ack_pending) { - wait_for_completion_timeout(&drvdata.send_cmd_complete, msecs_to_jiffies(25)); - drvdata.orphan_ack_pending = false; - drvdata.cmd_status = -ETIMEDOUT; + if (drvdata->orphan_ack_pending) { + wait_for_completion_timeout(&drvdata->send_cmd_complete, msecs_to_jiffies(25)); + drvdata->orphan_ack_pending = false; + drvdata->cmd_status = -ETIMEDOUT; } - reinit_completion(&drvdata.send_cmd_complete); + reinit_completion(&drvdata->send_cmd_complete); /* We can't use a devm_alloc reusable buffer without side effects during suspend */ dmabuf = kzalloc(GO_S_PACKET_SIZE, GFP_KERNEL); @@ -498,14 +508,14 @@ static int mcu_property_out(struct hid_device *hdev, u8 command, u8 index, /* PL_TEST commands can take longer because they go out to another device */ timeout = (command == GET_PL_TEST) ? 200 : 5; - t_remaining = wait_for_completion_interruptible_timeout(&drvdata.send_cmd_complete, + t_remaining = wait_for_completion_interruptible_timeout(&drvdata->send_cmd_complete, msecs_to_jiffies(timeout)); if (t_remaining <= 0) { /* A reply to this command may still be in flight. */ - drvdata.orphan_ack_pending = true; + drvdata->orphan_ack_pending = true; } - ret = t_remaining > 0 ? drvdata.cmd_status : t_remaining ?: -EBUSY; + ret = t_remaining > 0 ? drvdata->cmd_status : t_remaining ?: -EBUSY; return ret; } @@ -515,18 +525,30 @@ static ssize_t gamepad_property_store(struct device *dev, const char *buf, size_t count, enum feature_status_index index) { + struct gos_cfg_drvdata *drvdata; + struct led_classdev_mc *led_mc; + struct led_classdev *led_cdev; + struct hid_device *hdev; bool dev_registered; size_t size = 1; u8 val = 0; int ret; /* rgb_enabled is attached to led_classdev, not hid_device */ - if (index == FEATURE_RGB_ENABLE) - /* Pairs with smp_store_release from gos_cfg_setup */ - dev_registered = smp_load_acquire(&drvdata.rgb_registered); - else - /* Pairs with smp_store_release from gos_cfg_setup */ - dev_registered = smp_load_acquire(&drvdata.gp_registered); + if (index == FEATURE_RGB_ENABLE) { + led_cdev = dev_get_drvdata(dev); + led_mc = lcdev_to_mccdev(led_cdev); + drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); + hdev = drvdata->hdev; + /* Pairs with smp_store_release from cfg_setup */ + dev_registered = smp_load_acquire(&drvdata->rgb_registered); + + } else { + hdev = to_hid_device(dev); + drvdata = hid_get_drvdata(hdev); + /* Pairs with smp_store_release from cfg_setup */ + dev_registered = smp_load_acquire(&drvdata->gp_registered); + } if (!dev_registered) return -ENODEV; @@ -599,7 +621,7 @@ static ssize_t gamepad_property_store(struct device *dev, if (!val) size = 0; - ret = mcu_property_out(drvdata.hdev, SET_GAMEPAD_CFG, index, &val, + ret = mcu_property_out(hdev, SET_GAMEPAD_CFG, index, &val, size); if (ret < 0) return ret; @@ -611,79 +633,92 @@ static ssize_t gamepad_property_show(struct device *dev, struct device_attribute *attr, char *buf, enum feature_status_index index) { + struct gos_cfg_drvdata *drvdata; + struct led_classdev_mc *led_mc; + struct led_classdev *led_cdev; + struct hid_device *hdev; bool dev_registered; + ssize_t count = 0; u8 i; /* rgb_enabled is attached to led_classdev, not hid_device */ - if (index == FEATURE_RGB_ENABLE) - /* Pairs with smp_store_release from gos_cfg_setup */ - dev_registered = smp_load_acquire(&drvdata.rgb_registered); - else - /* Pairs with smp_store_release from gos_cfg_setup */ - dev_registered = smp_load_acquire(&drvdata.gp_registered); + if (index == FEATURE_RGB_ENABLE) { + led_cdev = dev_get_drvdata(dev); + led_mc = lcdev_to_mccdev(led_cdev); + drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); + hdev = drvdata->hdev; + /* Pairs with smp_store_release from cfg_setup */ + dev_registered = smp_load_acquire(&drvdata->rgb_registered); + + } else { + hdev = to_hid_device(dev); + drvdata = hid_get_drvdata(hdev); + /* Pairs with smp_store_release from cfg_setup */ + dev_registered = smp_load_acquire(&drvdata->gp_registered); + } if (!dev_registered) return -ENODEV; - count = mcu_property_out(drvdata.hdev, GET_GAMEPAD_CFG, index, NULL, 0); + count = mcu_property_out(hdev, GET_GAMEPAD_CFG, index, NULL, 0); if (count < 0) return count; switch (index) { case FEATURE_GAMEPAD_MODE: - i = drvdata.gp_mode; + i = drvdata->gp_mode; if (i >= ARRAY_SIZE(gamepad_mode_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", gamepad_mode_text[i]); break; case FEATURE_AUTO_SLEEP_TIME: - count = sysfs_emit(buf, "%u\n", drvdata.gp_auto_sleep_time); + count = sysfs_emit(buf, "%u\n", drvdata->gp_auto_sleep_time); break; case FEATURE_IMU_ENABLE: - i = drvdata.imu_sensor_en; + i = drvdata->imu_sensor_en; if (i >= ARRAY_SIZE(feature_enabled_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", feature_enabled_text[i]); break; case FEATURE_IMU_BYPASS: - i = drvdata.imu_bypass_en; + i = drvdata->imu_bypass_en; if (i >= ARRAY_SIZE(feature_enabled_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", feature_enabled_text[i]); break; case FEATURE_RGB_ENABLE: - i = drvdata.rgb_en; + i = drvdata->rgb_en; if (i >= ARRAY_SIZE(feature_enabled_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", feature_enabled_text[i]); break; case FEATURE_TOUCHPAD_ENABLE: - i = drvdata.tp_en; + i = drvdata->tp_en; if (i >= ARRAY_SIZE(feature_enabled_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", feature_enabled_text[i]); break; case FEATURE_OS_MODE: - i = drvdata.os_mode; + i = drvdata->os_mode; if (i >= ARRAY_SIZE(os_type_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", os_type_text[i]); break; case FEATURE_POLL_RATE: - i = drvdata.gp_poll_rate; + i = drvdata->gp_poll_rate; if (i >= ARRAY_SIZE(poll_rate_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", poll_rate_text[i]); break; case FEATURE_DPAD_MODE: - i = drvdata.gp_dpad_mode; + i = drvdata->gp_dpad_mode; if (i >= ARRAY_SIZE(dpad_mode_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", dpad_mode_text[i]); break; case FEATURE_MOUSE_WHEEL_STEP: - i = drvdata.mouse_step; + i = drvdata->mouse_step; if (i < 1 || i > 127) return -EINVAL; count = sysfs_emit(buf, "%u\n", i); @@ -761,13 +796,18 @@ static ssize_t touchpad_property_store(struct device *dev, const char *buf, size_t count, enum touchpad_config_index index) { + struct hid_device *hdev = to_hid_device(dev); + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); bool gp_registered; size_t size = 1; u8 val = 0; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - gp_registered = smp_load_acquire(&drvdata.gp_registered); + if (!drvdata) + return -ENODEV; + + /* Pairs with smp_store_release from cfg_setup */ + gp_registered = smp_load_acquire(&drvdata->gp_registered); if (!gp_registered) return -ENODEV; @@ -790,7 +830,7 @@ static ssize_t touchpad_property_store(struct device *dev, if (!val) size = 0; - ret = mcu_property_out(drvdata.hdev, SET_TP_PARAM, index, &val, size); + ret = mcu_property_out(hdev, SET_TP_PARAM, index, &val, size); if (ret < 0) return ret; @@ -801,25 +841,30 @@ static ssize_t touchpad_property_show(struct device *dev, struct device_attribute *attr, char *buf, enum touchpad_config_index index) { + struct hid_device *hdev = to_hid_device(dev); + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); bool gp_registered; int ret = 0; u8 i; - /* Pairs with smp_store_release from gos_cfg_setup */ - gp_registered = smp_load_acquire(&drvdata.gp_registered); + if (!drvdata) + return -ENODEV; + + /* Pairs with smp_store_release from cfg_setup */ + gp_registered = smp_load_acquire(&drvdata->gp_registered); if (!gp_registered) return -ENODEV; - ret = mcu_property_out(drvdata.hdev, GET_TP_PARAM, index, NULL, 0); + ret = mcu_property_out(hdev, GET_TP_PARAM, index, NULL, 0); if (ret < 0) return ret; switch (index) { case CFG_WINDOWS_MODE: - i = drvdata.tp_windows_mode; + i = drvdata->tp_windows_mode; break; case CFG_LINUX_MODE: - i = drvdata.tp_linux_mode; + i = drvdata->tp_linux_mode; break; default: return -EINVAL; @@ -836,15 +881,9 @@ static ssize_t touchpad_property_options(struct device *dev, char *buf, enum touchpad_config_index index) { - bool gp_registered; size_t count = 0; unsigned int i; - /* Pairs with smp_store_release from gos_cfg_setup */ - gp_registered = smp_load_acquire(&drvdata.gp_registered); - if (!gp_registered) - return -ENODEV; - switch (index) { case CFG_WINDOWS_MODE: case CFG_LINUX_MODE: @@ -867,30 +906,35 @@ static ssize_t test_property_show(struct device *dev, struct device_attribute *attr, char *buf, enum test_command_index index) { + struct hid_device *hdev = to_hid_device(dev); + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); bool gp_registered; size_t count = 0; u8 i; - /* Pairs with smp_store_release from gos_cfg_setup */ - gp_registered = smp_load_acquire(&drvdata.gp_registered); + if (!drvdata) + return -ENODEV; + + /* Pairs with smp_store_release from cfg_setup */ + gp_registered = smp_load_acquire(&drvdata->gp_registered); if (!gp_registered) return -ENODEV; switch (index) { case TEST_TP_MFR: - i = drvdata.tp_manufacturer; + i = drvdata->tp_manufacturer; if (i >= ARRAY_SIZE(touchpad_manufacturer_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", touchpad_manufacturer_text[i]); break; case TEST_IMU_MFR: - i = drvdata.imu_manufacturer; + i = drvdata->imu_manufacturer; if (i >= ARRAY_SIZE(imu_manufacturer_text)) return -EINVAL; count = sysfs_emit(buf, "%s\n", imu_manufacturer_text[i]); break; case TEST_TP_VER: - count = sysfs_emit(buf, "%u\n", drvdata.tp_version); + count = sysfs_emit(buf, "%u\n", drvdata->tp_version); break; default: count = -EINVAL; @@ -903,7 +947,13 @@ static ssize_t test_property_show(struct device *dev, static ssize_t mcu_id_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sysfs_emit(buf, "%*phN\n", 12, &drvdata.mcu_id); + struct hid_device *hdev = to_hid_device(dev); + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); + + if (!drvdata) + return -ENODEV; + + return sysfs_emit(buf, "%*phN\n", 12, &drvdata->mcu_id); } static int rgb_cfg_call(struct hid_device *hdev, enum mcu_command_index cmd, @@ -918,27 +968,29 @@ static int rgb_cfg_call(struct hid_device *hdev, enum mcu_command_index cmd, return mcu_property_out(hdev, cmd, index, val, size); } -static int rgb_attr_show(void) +static int rgb_attr_show(struct gos_cfg_drvdata *drvdata) { enum rgb_config_index index; - index = drvdata.rgb_profile + 2; + index = drvdata->rgb_profile + 2; - return rgb_cfg_call(drvdata.hdev, GET_RGB_CFG, index, NULL, 0); + return rgb_cfg_call(drvdata->hdev, GET_RGB_CFG, index, NULL, 0); }; static ssize_t rgb_effect_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct led_classdev_mc *led_mc = &drvdata.led_mc; + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); enum rgb_config_index index; bool rgb_registered; u8 effect; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; @@ -947,41 +999,44 @@ static ssize_t rgb_effect_store(struct device *dev, return ret; effect = ret; - index = drvdata.rgb_profile + 2; + index = drvdata->rgb_profile + 2; u8 rgb_profile[6] = { effect, led_mc->subled_info[0].intensity, led_mc->subled_info[1].intensity, led_mc->subled_info[2].intensity, led_mc->led_cdev.brightness, - drvdata.rgb_speed }; + drvdata->rgb_speed }; - ret = rgb_cfg_call(drvdata.hdev, SET_RGB_CFG, index, rgb_profile, 6); + ret = rgb_cfg_call(drvdata->hdev, SET_RGB_CFG, index, rgb_profile, 6); if (ret) return ret; - drvdata.rgb_effect = effect; + drvdata->rgb_effect = effect; return count; }; static ssize_t rgb_effect_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; - ret = rgb_attr_show(); + ret = rgb_attr_show(drvdata); if (ret) return ret; - if (drvdata.rgb_effect >= ARRAY_SIZE(rgb_effect_text)) + if (drvdata->rgb_effect >= ARRAY_SIZE(rgb_effect_text)) return -EINVAL; - return sysfs_emit(buf, "%s\n", rgb_effect_text[drvdata.rgb_effect]); + return sysfs_emit(buf, "%s\n", rgb_effect_text[drvdata->rgb_effect]); } static ssize_t rgb_effect_index_show(struct device *dev, @@ -1003,14 +1058,16 @@ static ssize_t rgb_speed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct led_classdev_mc *led_mc = &drvdata.led_mc; + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); enum rgb_config_index index; bool rgb_registered; int val = 0; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; @@ -1021,19 +1078,19 @@ static ssize_t rgb_speed_store(struct device *dev, if (val < 0 || val > 100) return -EINVAL; - index = drvdata.rgb_profile + 2; - u8 rgb_profile[6] = { drvdata.rgb_effect, + index = drvdata->rgb_profile + 2; + u8 rgb_profile[6] = { drvdata->rgb_effect, led_mc->subled_info[0].intensity, led_mc->subled_info[1].intensity, led_mc->subled_info[2].intensity, led_mc->led_cdev.brightness, val }; - ret = rgb_cfg_call(drvdata.hdev, SET_RGB_CFG, index, rgb_profile, 6); + ret = rgb_cfg_call(drvdata->hdev, SET_RGB_CFG, index, rgb_profile, 6); if (ret) return ret; - drvdata.rgb_speed = val; + drvdata->rgb_speed = val; return count; }; @@ -1041,22 +1098,25 @@ static ssize_t rgb_speed_store(struct device *dev, static ssize_t rgb_speed_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; - ret = rgb_attr_show(); + ret = rgb_attr_show(drvdata); if (ret) return ret; - if (drvdata.rgb_speed > 100) + if (drvdata->rgb_speed > 100) return -EINVAL; - return sysfs_emit(buf, "%hhu\n", drvdata.rgb_speed); + return sysfs_emit(buf, "%hhu\n", drvdata->rgb_speed); } static ssize_t rgb_speed_range_show(struct device *dev, @@ -1068,12 +1128,15 @@ static ssize_t rgb_speed_range_show(struct device *dev, static ssize_t rgb_mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; int ret; u8 val; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; @@ -1083,12 +1146,12 @@ static ssize_t rgb_mode_store(struct device *dev, struct device_attribute *attr, val = ret; - ret = rgb_cfg_call(drvdata.hdev, SET_RGB_CFG, LIGHT_MODE_SEL, &val, + ret = rgb_cfg_call(drvdata->hdev, SET_RGB_CFG, LIGHT_MODE_SEL, &val, 1); if (ret) return ret; - drvdata.rgb_mode = val; + drvdata->rgb_mode = val; return count; }; @@ -1096,22 +1159,25 @@ static ssize_t rgb_mode_store(struct device *dev, struct device_attribute *attr, static ssize_t rgb_mode_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; - ret = rgb_cfg_call(drvdata.hdev, GET_RGB_CFG, LIGHT_MODE_SEL, NULL, 0); + ret = rgb_cfg_call(drvdata->hdev, GET_RGB_CFG, LIGHT_MODE_SEL, NULL, 0); if (ret) return ret; - if (drvdata.rgb_mode >= ARRAY_SIZE(rgb_mode_text)) + if (drvdata->rgb_mode >= ARRAY_SIZE(rgb_mode_text)) return -EINVAL; - return sysfs_emit(buf, "%s\n", rgb_mode_text[drvdata.rgb_mode]); + return sysfs_emit(buf, "%s\n", rgb_mode_text[drvdata->rgb_mode]); }; static ssize_t rgb_mode_index_show(struct device *dev, @@ -1133,13 +1199,16 @@ static ssize_t rgb_profile_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; size_t size = 1; int ret; u8 val; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; @@ -1150,11 +1219,11 @@ static ssize_t rgb_profile_store(struct device *dev, if (val < 1 || val > 3) return -EINVAL; - ret = rgb_cfg_call(drvdata.hdev, SET_RGB_CFG, LIGHT_PROFILE_SEL, &val, size); + ret = rgb_cfg_call(drvdata->hdev, SET_RGB_CFG, LIGHT_PROFILE_SEL, &val, size); if (ret) return ret; - drvdata.rgb_profile = val; + drvdata->rgb_profile = val; return count; }; @@ -1162,22 +1231,25 @@ static ssize_t rgb_profile_store(struct device *dev, static ssize_t rgb_profile_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *led_cdev = dev_get_drvdata(dev); + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); bool rgb_registered; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return -ENODEV; - ret = rgb_cfg_call(drvdata.hdev, GET_RGB_CFG, LIGHT_PROFILE_SEL, NULL, 0); + ret = rgb_cfg_call(drvdata->hdev, GET_RGB_CFG, LIGHT_PROFILE_SEL, NULL, 0); if (ret) return ret; - if (drvdata.rgb_profile < 1 || drvdata.rgb_profile > 3) + if (drvdata->rgb_profile < 1 || drvdata->rgb_profile > 3) return -EINVAL; - return sysfs_emit(buf, "%hhu\n", drvdata.rgb_profile); + return sysfs_emit(buf, "%hhu\n", drvdata->rgb_profile); }; static ssize_t rgb_profile_range_show(struct device *dev, @@ -1189,13 +1261,14 @@ static ssize_t rgb_profile_range_show(struct device *dev, static void hid_gos_brightness_set(struct led_classdev *led_cdev, enum led_brightness brightness) { - struct led_classdev_mc *led_mc = &drvdata.led_mc; + struct led_classdev_mc *led_mc = lcdev_to_mccdev(led_cdev); + struct gos_cfg_drvdata *drvdata = container_of(led_mc, struct gos_cfg_drvdata, led_mc); enum rgb_config_index index; bool rgb_registered; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!rgb_registered) return; @@ -1204,15 +1277,15 @@ static void hid_gos_brightness_set(struct led_classdev *led_cdev, return; } - index = drvdata.rgb_profile + 2; - u8 rgb_profile[6] = { drvdata.rgb_effect, + index = drvdata->rgb_profile + 2; + u8 rgb_profile[6] = { drvdata->rgb_effect, led_mc->subled_info[0].intensity, led_mc->subled_info[1].intensity, led_mc->subled_info[2].intensity, brightness, - drvdata.rgb_speed }; + drvdata->rgb_speed }; - ret = rgb_cfg_call(drvdata.hdev, SET_RGB_CFG, index, rgb_profile, 6); + ret = rgb_cfg_call(drvdata->hdev, SET_RGB_CFG, index, rgb_profile, 6); switch (ret) { case 0: led_cdev->brightness = brightness; @@ -1448,155 +1521,166 @@ static struct mc_subled gos_rgb_subled_info[] = { }, }; -static int cfg_query_device(void) +static int cfg_query_device(struct gos_cfg_drvdata *drvdata) { int ret; /* MCU */ - ret = mcu_property_out(drvdata.hdev, GET_MCU_ID, FEATURE_NONE, NULL, 0); + ret = mcu_property_out(drvdata->hdev, GET_MCU_ID, FEATURE_NONE, NULL, 0); if (ret) { - dev_err(&drvdata.hdev->dev, "Failed to retrieve MCU ID: %i\n", ret); + dev_err(&drvdata->hdev->dev, "Failed to retrieve MCU ID: %i\n", ret); return ret; } - ret = mcu_property_out(drvdata.hdev, GET_VERSION, FEATURE_NONE, NULL, 0); + ret = mcu_property_out(drvdata->hdev, GET_VERSION, FEATURE_NONE, NULL, 0); if (ret) { - dev_err(&drvdata.hdev->dev, "Failed to retrieve MCU Version: %i\n", ret); + dev_err(&drvdata->hdev->dev, "Failed to retrieve MCU Version: %i\n", ret); return ret; } - ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_TP_MFR, NULL, 0); + ret = mcu_property_out(drvdata->hdev, GET_PL_TEST, TEST_TP_MFR, NULL, 0); if (ret) { - dev_err(&drvdata.hdev->dev, + dev_err(&drvdata->hdev->dev, "Failed to retrieve Touchpad Manufacturer: %i\n", ret); return ret; } - ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_TP_VER, NULL, 0); + ret = mcu_property_out(drvdata->hdev, GET_PL_TEST, TEST_TP_VER, NULL, 0); if (ret) { - dev_err(&drvdata.hdev->dev, + dev_err(&drvdata->hdev->dev, "Failed to retrieve Touchpad Firmware Version: %i\n", ret); return ret; } - ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_IMU_MFR, NULL, 0); + ret = mcu_property_out(drvdata->hdev, GET_PL_TEST, TEST_IMU_MFR, NULL, 0); if (ret) { - dev_err(&drvdata.hdev->dev, + dev_err(&drvdata->hdev->dev, "Failed to retrieve IMU Manufacturer: %i\n", ret); return ret; } - return mcu_property_out(drvdata.hdev, GET_GAMEPAD_CFG, FEATURE_OS_MODE, + return mcu_property_out(drvdata->hdev, GET_GAMEPAD_CFG, FEATURE_OS_MODE, NULL, 0); } static void cfg_setup(struct work_struct *work) { + struct delayed_work *dwork = container_of(work, struct delayed_work, work); + struct gos_cfg_drvdata *drvdata = container_of(dwork, struct gos_cfg_drvdata, + gos_cfg_setup); bool gp_registered = false; bool rgb_registered = false; int ret; - ret = cfg_query_device(); + if (!drvdata) + return; + + ret = cfg_query_device(drvdata); if (ret) { /* The MCU may not be ready yet. Retry a bounded number of * times before giving up. */ - drvdata.setup_attempts++; - if (drvdata.setup_attempts >= 5) { - dev_err(&drvdata.hdev->dev, + drvdata->setup_attempts++; + if (drvdata->setup_attempts >= 5) { + dev_err(&drvdata->hdev->dev, "Giving up on device setup after %d attempts\n", - drvdata.setup_attempts); + drvdata->setup_attempts); return; } - schedule_delayed_work(&drvdata.gos_cfg_setup, msecs_to_jiffies(50)); + schedule_delayed_work(&drvdata->gos_cfg_setup, msecs_to_jiffies(50)); return; } - drvdata.setup_attempts = 0; + drvdata->setup_attempts = 0; - if (!drvdata.gp_registered) { - /* Pairs with smp_load_acquire in attribute show/store functions */ - smp_store_release(&drvdata.gp_registered, true); + if (!drvdata->gp_registered) { + /* Pairs with smp_load_acquire in attribute show/store */ + smp_store_release(&drvdata->gp_registered, true); gp_registered = true; - ret = sysfs_create_groups(&drvdata.hdev->dev.kobj, top_level_attr_groups); + ret = sysfs_create_groups(&drvdata->hdev->dev.kobj, top_level_attr_groups); if (ret) { - dev_err(&drvdata.hdev->dev, + dev_err(&drvdata->hdev->dev, "Failed to create gamepad configuration attributes: %i\n", ret); - /* Pairs with smp_load_acquire in attribute show/store functions */ - smp_store_release(&drvdata.gp_registered, false); + /* Pairs with smp_load_acquire in attribute show/store */ + smp_store_release(&drvdata->gp_registered, false); gp_registered = false; } } - if (!drvdata.rgb_registered) { - /* Pairs with smp_load_acquire in attribute show/store functions */ - smp_store_release(&drvdata.rgb_registered, true); + if (!drvdata->rgb_registered) { + /* Pairs with smp_load_acquire in attribute show/store */ + smp_store_release(&drvdata->rgb_registered, true); rgb_registered = true; - ret = led_classdev_multicolor_register(&drvdata.hdev->dev, - &drvdata.led_mc); + ret = led_classdev_multicolor_register(&drvdata->hdev->dev, + &drvdata->led_mc); if (ret) { - dev_err(&drvdata.hdev->dev, "Failed to create RGB device: %i\n", + dev_err(&drvdata->hdev->dev, "Failed to create RGB device: %i\n", ret); - /* Pairs with smp_load_acquire in attribute show/store functions */ - smp_store_release(&drvdata.rgb_registered, false); + /* Pairs with smp_load_acquire in attribute show/store */ + smp_store_release(&drvdata->rgb_registered, false); rgb_registered = false; } else { - ret = devm_device_add_group(drvdata.led_mc.led_cdev.dev, + ret = devm_device_add_group(drvdata->led_mc.led_cdev.dev, &rgb_attr_group); if (ret) { - dev_err(&drvdata.hdev->dev, + dev_err(&drvdata->hdev->dev, "Failed to create RGB configuration attributes: %i\n", ret); - led_classdev_multicolor_unregister(&drvdata.led_mc); + led_classdev_multicolor_unregister(&drvdata->led_mc); - /* Pairs with smp_load_acquire in attribute show/store functions */ - smp_store_release(&drvdata.rgb_registered, false); + /* Pairs with smp_load_acquire in attribute show/store */ + smp_store_release(&drvdata->rgb_registered, false); rgb_registered = false; } } } if (gp_registered) - kobject_uevent(&drvdata.hdev->dev.kobj, KOBJ_CHANGE); + kobject_uevent(&drvdata->hdev->dev.kobj, KOBJ_CHANGE); if (rgb_registered) - kobject_uevent(&drvdata.led_mc.led_cdev.dev->kobj, KOBJ_CHANGE); + kobject_uevent(&drvdata->led_mc.led_cdev.dev->kobj, KOBJ_CHANGE); } static int hid_gos_cfg_probe(struct hid_device *hdev, const struct hid_device_id *_id) { + struct gos_cfg_drvdata *drvdata; int ret; - hid_set_drvdata(hdev, &drvdata); - drvdata.hdev = hdev; + drvdata = devm_kzalloc(&hdev->dev, sizeof(struct gos_cfg_drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + + hid_set_drvdata(hdev, drvdata); + drvdata->hdev = hdev; - mutex_init(&drvdata.cfg_mutex); - init_completion(&drvdata.send_cmd_complete); + mutex_init(&drvdata->cfg_mutex); + init_completion(&drvdata->send_cmd_complete); /* Device is hardwired and name is guaranteed to be unique */ - drvdata.led_mc.led_cdev.name = "go_s:rgb:joystick_rings"; - drvdata.led_mc.led_cdev.brightness = 0x50; - drvdata.led_mc.led_cdev.max_brightness = 0x64; - drvdata.led_mc.led_cdev.color = LED_COLOR_ID_RGB; - drvdata.led_mc.led_cdev.brightness_set = hid_gos_brightness_set; - drvdata.led_mc.num_colors = 3; - drvdata.led_mc.subled_info = devm_kmemdup(&hdev->dev, gos_rgb_subled_info, - sizeof(gos_rgb_subled_info), GFP_KERNEL); - if (!drvdata.led_mc.subled_info) + drvdata->led_mc.led_cdev.name = "go_s:rgb:joystick_rings"; + drvdata->led_mc.led_cdev.brightness = 0x50; + drvdata->led_mc.led_cdev.max_brightness = 0x64; + drvdata->led_mc.led_cdev.color = LED_COLOR_ID_RGB; + drvdata->led_mc.led_cdev.brightness_set = hid_gos_brightness_set; + drvdata->led_mc.num_colors = 3; + drvdata->led_mc.subled_info = devm_kmemdup(&hdev->dev, gos_rgb_subled_info, + sizeof(gos_rgb_subled_info), GFP_KERNEL); + if (!drvdata->led_mc.subled_info) return -ENOMEM; /* Executing calls prior to returning from probe will lock the MCU. Schedule * initial data call after probe has completed and MCU can accept calls. */ - INIT_DELAYED_WORK(&drvdata.gos_cfg_setup, &cfg_setup); - ret = schedule_delayed_work(&drvdata.gos_cfg_setup, msecs_to_jiffies(2)); + INIT_DELAYED_WORK(&drvdata->gos_cfg_setup, &cfg_setup); + ret = schedule_delayed_work(&drvdata->gos_cfg_setup, msecs_to_jiffies(2)); if (!ret) { dev_err(&hdev->dev, "Failed to schedule startup delayed work\n"); return -ENODEV; @@ -1607,15 +1691,19 @@ static int hid_gos_cfg_probe(struct hid_device *hdev, static void hid_gos_cfg_remove(struct hid_device *hdev) { + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); bool rgb_registered; - disable_delayed_work_sync(&drvdata.gos_cfg_setup); + if (!drvdata) + return; + + disable_delayed_work_sync(&drvdata->gos_cfg_setup); sysfs_remove_groups(&hdev->dev.kobj, top_level_attr_groups); - /* Pairs with smp_store_release in cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (rgb_registered) - led_classdev_multicolor_unregister(&drvdata.led_mc); + led_classdev_multicolor_unregister(&drvdata->led_mc); hid_hw_close(hdev); hid_hw_stop(hdev); @@ -1624,16 +1712,21 @@ static void hid_gos_cfg_remove(struct hid_device *hdev) static int hid_gos_cfg_reset_resume(struct hid_device *hdev) { + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); bool gp_registered, rgb_registered; - u8 os_mode = drvdata.os_mode; + u8 os_mode; int ret; - /* Pairs with smp_store_release from gos_cfg_setup */ - gp_registered = smp_load_acquire(&drvdata.gp_registered); - /* Pairs with smp_store_release from gos_cfg_setup */ - rgb_registered = smp_load_acquire(&drvdata.rgb_registered); + if (!drvdata) + return -ENODEV; + + os_mode = drvdata->os_mode; + /* Pairs with smp_store_release from cfg_setup */ + gp_registered = smp_load_acquire(&drvdata->gp_registered); + /* Pairs with smp_store_release from cfg_setup */ + rgb_registered = smp_load_acquire(&drvdata->rgb_registered); if (!gp_registered || !rgb_registered) { - ret = schedule_delayed_work(&drvdata.gos_cfg_setup, msecs_to_jiffies(2)); + ret = schedule_delayed_work(&drvdata->gos_cfg_setup, msecs_to_jiffies(2)); if (!ret) { dev_err(&hdev->dev, "Failed to schedule startup delayed work\n"); return -ENODEV; @@ -1642,20 +1735,20 @@ static int hid_gos_cfg_reset_resume(struct hid_device *hdev) return 0; } - ret = mcu_property_out(drvdata.hdev, SET_GAMEPAD_CFG, + ret = mcu_property_out(drvdata->hdev, SET_GAMEPAD_CFG, FEATURE_OS_MODE, &os_mode, 1); if (ret < 0) return ret; - ret = mcu_property_out(drvdata.hdev, GET_GAMEPAD_CFG, + ret = mcu_property_out(drvdata->hdev, GET_GAMEPAD_CFG, FEATURE_OS_MODE, NULL, 0); if (ret < 0) return ret; - if (drvdata.os_mode != os_mode) + if (drvdata->os_mode != os_mode) return -ENODEV; - kobject_uevent(&drvdata.hdev->dev.kobj, KOBJ_CHANGE); + kobject_uevent(&drvdata->hdev->dev.kobj, KOBJ_CHANGE); return 0; } @@ -1730,9 +1823,14 @@ static int hid_gos_reset_resume(struct hid_device *hdev) return 0; } -static int hid_gos_cfg_suspend(void) +static int hid_gos_cfg_suspend(struct hid_device *hdev) { - cancel_delayed_work_sync(&drvdata.gos_cfg_setup); + struct gos_cfg_drvdata *drvdata = hid_get_drvdata(hdev); + + if (!drvdata) + return -ENODEV; + + cancel_delayed_work_sync(&drvdata->gos_cfg_setup); return 0; } @@ -1749,7 +1847,7 @@ static int hid_gos_suspend(struct hid_device *hdev, pm_message_t msg) ep = ret; if (ep == GO_S_CFG_INTF_IN) - return hid_gos_cfg_suspend(); + return hid_gos_cfg_suspend(hdev); return 0; } -- 2.55.0