From 08f3df928fc8cbab2cae09296f568ed294b3a81a Mon Sep 17 00:00:00 2001 From: Shyam Sundar S K Date: Tue, 9 Jun 2026 13:40:40 +0530 Subject: platform/x86/amd/pmf: Store commonly used enums in the header file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relocate commonly used enums from multiple source files into a shared header file to simplify code structure, improve readability, and enhance maintainability. Also, remove the initialization of the first enum member, since it is not needed. Add the AMD_PMF_ prefix to the laptop_placement and platform_type enums since these names are overly generic for inclusion in a UAPI header Co-developed-by: Sanket Goswami Signed-off-by: Sanket Goswami Signed-off-by: Shyam Sundar S K Link: https://patch.msgid.link/20260609081044.2416731-4-Shyam-sundar.S-k@amd.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen --- drivers/platform/x86/amd/pmf/pmf.h | 22 ---------------------- drivers/platform/x86/amd/pmf/spc.c | 37 +++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 40 deletions(-) (limited to 'drivers/platform') diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index ffe74ebc46f8..269c0a4b1cae 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -682,14 +682,6 @@ enum system_state { SYSTEM_STATE_MAX, }; -enum ta_slider { - TA_BEST_BATTERY, - TA_BETTER_BATTERY, - TA_BETTER_PERFORMANCE, - TA_BEST_PERFORMANCE, - TA_MAX, -}; - struct amd_pmf_pb_bitmap { const char *name; u32 bit_mask; @@ -721,20 +713,6 @@ static const struct amd_pmf_pb_bitmap custom_bios_inputs_v1[] __used = { {"NOTIFY_CUSTOM_BIOS_INPUT10", BIT(16)}, }; -enum platform_type { - PTYPE_UNKNOWN = 0, - LID_CLOSE, - CLAMSHELL, - FLAT, - TENT, - STAND, - TABLET, - BOOK, - PRESENTATION, - PULL_FWD, - PTYPE_INVALID = 0xf, -}; - /* Command ids for TA communication */ enum ta_pmf_command { TA_PMF_COMMAND_POLICY_BUILDER_INITIALIZE, diff --git a/drivers/platform/x86/amd/pmf/spc.c b/drivers/platform/x86/amd/pmf/spc.c index f48678a23cc7..05998946d1bd 100644 --- a/drivers/platform/x86/amd/pmf/spc.c +++ b/drivers/platform/x86/amd/pmf/spc.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -20,21 +21,21 @@ static const char *platform_type_as_str(u16 platform_type) { switch (platform_type) { - case CLAMSHELL: + case AMD_PMF_CLAMSHELL: return "CLAMSHELL"; - case FLAT: + case AMD_PMF_FLAT: return "FLAT"; - case TENT: + case AMD_PMF_TENT: return "TENT"; - case STAND: + case AMD_PMF_STAND: return "STAND"; - case TABLET: + case AMD_PMF_TABLET: return "TABLET"; - case BOOK: + case AMD_PMF_BOOK: return "BOOK"; - case PRESENTATION: + case AMD_PMF_PRESENTATION: return "PRESENTATION"; - case PULL_FWD: + case AMD_PMF_PULL_FWD: return "PULL_FWD"; default: return "UNKNOWN"; @@ -44,13 +45,13 @@ static const char *platform_type_as_str(u16 platform_type) static const char *laptop_placement_as_str(u16 device_state) { switch (device_state) { - case ON_TABLE: + case AMD_PMF_ON_TABLE: return "ON_TABLE"; - case ON_LAP_MOTION: + case AMD_PMF_ON_LAP_MOTION: return "ON_LAP_MOTION"; - case IN_BAG: + case AMD_PMF_IN_BAG: return "IN_BAG"; - case OUT_OF_BAG: + case AMD_PMF_OUT_OF_BAG: return "OUT_OF_BAG"; default: return "UNKNOWN"; @@ -60,11 +61,11 @@ static const char *laptop_placement_as_str(u16 device_state) static const char *ta_slider_as_str(unsigned int state) { switch (state) { - case TA_BEST_PERFORMANCE: + case AMD_PMF_TA_BEST_PERFORMANCE: return "PERFORMANCE"; - case TA_BETTER_PERFORMANCE: + case AMD_PMF_TA_BETTER_PERFORMANCE: return "BALANCED"; - case TA_BEST_BATTERY: + case AMD_PMF_TA_BEST_BATTERY: return "POWER_SAVER"; default: return "Unknown TA Slider State"; @@ -287,14 +288,14 @@ static int amd_pmf_get_slider_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_ switch (dev->current_profile) { case PLATFORM_PROFILE_PERFORMANCE: case PLATFORM_PROFILE_BALANCED_PERFORMANCE: - val = TA_BEST_PERFORMANCE; + val = AMD_PMF_TA_BEST_PERFORMANCE; break; case PLATFORM_PROFILE_BALANCED: - val = TA_BETTER_PERFORMANCE; + val = AMD_PMF_TA_BETTER_PERFORMANCE; break; case PLATFORM_PROFILE_LOW_POWER: case PLATFORM_PROFILE_QUIET: - val = TA_BEST_BATTERY; + val = AMD_PMF_TA_BEST_BATTERY; break; default: dev_err(dev->dev, "Unknown Platform Profile.\n"); -- cgit v1.2.3