Unverified Commit 665fab33 authored by Antheas Kapenekakis's avatar Antheas Kapenekakis Committed by Ilpo Järvinen
Browse files

platform/x86: oxpec: Move fan speed read to separate function 



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: default avatarDerek J. Clark <derekjohn.clark@gmail.com>
Reviewed-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarAntheas Kapenekakis <lkml@antheas.dev>
Link: https://lore.kernel.org/r/20250425111821.88746-11-lkml@antheas.dev


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent b804a9b8

drivers/platform/x86/oxpec.c

+29 −24
Original line number Diff line number Diff line
@@ -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)

{
@@ -694,30 +722,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;

		}