From: Antheas Kapenekakis <lkml@antheas.dev>
To: platform-driver-x86@vger.kernel.org
Cc: linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org,
linux-pm@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Jean Delvare <jdelvare@suse.com>,
Jonathan Corbet <corbet@lwn.net>,
Joaquin Ignacio Aramendia <samsagax@gmail.com>,
Derek J Clark <derekjohn.clark@gmail.com>,
Kevin Greenberg <kdgreenberg234@protonmail.com>,
Joshua Tam <csinaction@pm.me>,
Parth Menon <parthasarathymenon@gmail.com>,
Eileen <eileen@one-netbook.com>,
linux-kernel@vger.kernel.org, sre@kernel.org,
linux@weissschuh.net, ilpo.jarvinen@linux.intel.com,
hdegoede@redhat.com, mario.limonciello@amd.com,
Antheas Kapenekakis <lkml@antheas.dev>
Subject: [PATCH v8 10/14] platform/x86: oxpec: Move fan speed read to separate function
Date: Sat, 22 Mar 2025 11:36:02 +0100 [thread overview]
Message-ID: <20250322103606.680401-11-lkml@antheas.dev> (raw)
In-Reply-To: <20250322103606.680401-1-lkml@antheas.dev>
While not necessary for fixing the ABI hwmon issue, fan speed will be
the only remaining value without a function. Therefore, finish the
refactor by moving it to a separate function.
Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/platform/x86/oxpec.c | 53 ++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c
index 67bfd397802d1..5b84647569931 100644
--- a/drivers/platform/x86/oxpec.c
+++ b/drivers/platform/x86/oxpec.c
@@ -599,6 +599,34 @@ static umode_t oxp_ec_hwmon_is_visible(const void *drvdata,
}
}
+/* Fan speed read function */
+static int oxp_pwm_fan_speed(long *val)
+{
+ switch (board) {
+ case orange_pi_neo:
+ return read_from_ec(ORANGEPI_SENSOR_FAN_REG, 2, val);
+ case oxp_2:
+ case oxp_x1:
+ return read_from_ec(OXP_2_SENSOR_FAN_REG, 2, val);
+ case aok_zoe_a1:
+ case aya_neo_2:
+ case aya_neo_air:
+ case aya_neo_air_1s:
+ case aya_neo_air_plus_mendo:
+ case aya_neo_air_pro:
+ case aya_neo_flip:
+ case aya_neo_geek:
+ case aya_neo_kun:
+ case oxp_fly:
+ case oxp_mini_amd:
+ case oxp_mini_amd_a07:
+ case oxp_mini_amd_pro:
+ return read_from_ec(OXP_SENSOR_FAN_REG, 2, val);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
/* PWM input read/write functions */
static int oxp_pwm_input_write(long val)
{
@@ -693,30 +721,7 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_fan:
switch (attr) {
case hwmon_fan_input:
- switch (board) {
- case orange_pi_neo:
- return read_from_ec(ORANGEPI_SENSOR_FAN_REG, 2, val);
- case oxp_2:
- case oxp_x1:
- return read_from_ec(OXP_2_SENSOR_FAN_REG, 2, val);
- case aok_zoe_a1:
- case aya_neo_2:
- case aya_neo_air:
- case aya_neo_air_1s:
- case aya_neo_air_plus_mendo:
- case aya_neo_air_pro:
- case aya_neo_flip:
- case aya_neo_geek:
- case aya_neo_kun:
- case oxp_fly:
- case oxp_mini_amd:
- case oxp_mini_amd_a07:
- case oxp_mini_amd_pro:
- return read_from_ec(OXP_SENSOR_FAN_REG, 2, val);
- default:
- break;
- }
- break;
+ return oxp_pwm_fan_speed(val);
default:
break;
}
--
2.48.1
next prev parent reply other threads:[~2025-03-22 10:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-22 10:35 [PATCH v8 00/14] hwmon: (oxpsensors) Add devices, features, fix ABI and move to platform/x86 Antheas Kapenekakis
2025-03-22 10:35 ` [PATCH v8 01/14] hwmon: (oxp-sensors) Distinguish the X1 variants Antheas Kapenekakis
2025-04-11 15:30 ` Ilpo Järvinen
2025-03-22 10:35 ` [PATCH v8 02/14] hwmon: (oxp-sensors) Add all OneXFly variants Antheas Kapenekakis
2025-04-11 15:29 ` Ilpo Järvinen
2025-03-22 10:35 ` [PATCH v8 03/14] platform/x86: oxpec: Move hwmon/oxp-sensors to platform/x86 Antheas Kapenekakis
2025-04-11 15:28 ` Ilpo Järvinen
2025-04-12 8:03 ` Antheas Kapenekakis
2025-03-22 10:35 ` [PATCH v8 04/14] ABI: testing: sysfs-class-oxp: add missing documentation Antheas Kapenekakis
2025-03-22 10:35 ` [PATCH v8 05/14] ABI: testing: sysfs-class-oxp: add tt_led attribute documentation Antheas Kapenekakis
2025-04-11 15:23 ` Ilpo Järvinen
2025-03-22 10:35 ` [PATCH v8 06/14] platform/x86: oxpec: Rename ec group to tt_toggle Antheas Kapenekakis
2025-04-11 15:22 ` Ilpo Järvinen
2025-03-22 10:35 ` [PATCH v8 07/14] platform/x86: oxpec: Add turbo led support to X1 devices Antheas Kapenekakis
2025-04-11 15:21 ` Ilpo Järvinen
2025-03-22 10:36 ` [PATCH v8 08/14] platform/x86: oxpec: Move pwm_enable read to its own function Antheas Kapenekakis
2025-04-11 15:16 ` Ilpo Järvinen
2025-03-22 10:36 ` [PATCH v8 09/14] platform/x86: oxpec: Move pwm value read/write to separate functions Antheas Kapenekakis
2025-04-11 15:15 ` Ilpo Järvinen
2025-03-22 10:36 ` Antheas Kapenekakis [this message]
2025-04-11 15:13 ` [PATCH v8 10/14] platform/x86: oxpec: Move fan speed read to separate function Ilpo Järvinen
2025-03-22 10:36 ` [PATCH v8 11/14] platform/x86: oxpec: Adhere to sysfs-class-hwmon and enable pwm on 2 Antheas Kapenekakis
2025-04-11 15:13 ` Ilpo Järvinen
2025-04-12 7:59 ` Antheas Kapenekakis
2025-03-22 10:36 ` [PATCH v8 12/14] platform/x86: oxpec: Follow reverse xmas convention for tt_toggle Antheas Kapenekakis
2025-04-11 15:09 ` Ilpo Järvinen
2025-03-22 10:36 ` [PATCH v8 13/14] power: supply: add inhibit-charge-awake to charge_behaviour Antheas Kapenekakis
2025-03-22 10:36 ` [PATCH v8 14/14] platform/x86: oxpec: Add charge threshold and behaviour to OneXPlayer Antheas Kapenekakis
2025-04-11 15:08 ` Ilpo Järvinen
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=20250322103606.680401-11-lkml@antheas.dev \
--to=lkml@antheas.dev \
--cc=corbet@lwn.net \
--cc=csinaction@pm.me \
--cc=derekjohn.clark@gmail.com \
--cc=eileen@one-netbook.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jdelvare@suse.com \
--cc=kdgreenberg234@protonmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=linux@weissschuh.net \
--cc=mario.limonciello@amd.com \
--cc=parthasarathymenon@gmail.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=samsagax@gmail.com \
--cc=sre@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.