platform/x86: msi-ec: rename fn_super_swap

This patch renames fn_super_swap to fn_win_swap for consistency
with the downstream version of the driver. Renaming the field to
fn_super_swap in the downstream driver would require modifying several
branches that are yet to be merged into the main branch, so I decided
to do it here instead.

Cc: Aakash Singh <mail@singhaakash.dev>
Cc: Jose Angel Pastrana <japp0005@red.ujaen.es>
Signed-off-by: Nikita Kravets <teackot@gmail.com>
Link: https://lore.kernel.org/r/20231006175352.1753017-7-teackot@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/msi-ec.c b/drivers/platform/x86/msi-ec.c
index f26a3121092f9790ea78567d4db97ae17211cbf2..48311d5a41ce60fe65531d01b4872ad05c1567ab 100644 (file)
--- a/drivers/platform/x86/msi-ec.c
+++ b/drivers/platform/x86/msi-ec.c
@@ -58,7 +58,7 @@ static struct msi_ec_conf CONF0 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xbf,
                .bit     = 4,
        },
@@ -138,7 +138,7 @@ static struct msi_ec_conf CONF1 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xbf,
                .bit     = 4,
        },
@@ -215,7 +215,7 @@ static struct msi_ec_conf CONF2 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xe8,
                .bit     = 4,
        },
@@ -294,7 +294,7 @@ static struct msi_ec_conf CONF3 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xe8,
                .bit     = 4,
        },
@@ -372,7 +372,7 @@ static struct msi_ec_conf CONF4 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = MSI_EC_ADDR_UNKNOWN, // supported, but unknown
                .bit     = 4,
        },
@@ -451,7 +451,7 @@ static struct msi_ec_conf CONF5 __initdata = {
                .block_address = 0x2f,
                .bit           = 1,
        },
-       .fn_super_swap = { // todo: reverse
+       .fn_win_swap = { // todo: reverse
                .address = 0xbf,
                .bit     = 4,
        },
@@ -529,7 +529,7 @@ static struct msi_ec_conf CONF6 __initdata = {
                .block_address = MSI_EC_ADDR_UNSUPP,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xbf, // todo: reverse
                .bit     = 4,
        },
@@ -609,7 +609,7 @@ static struct msi_ec_conf CONF7 __initdata = {
                .block_address = MSI_EC_ADDR_UNSUPP,
                .bit           = 1,
        },
-       .fn_super_swap = {
+       .fn_win_swap = {
                .address = 0xbf, // needs testing
                .bit     = 4,
        },

diff --git a/drivers/platform/x86/msi-ec.h b/drivers/platform/x86/msi-ec.h
index be3533dc9cc6c9ce7979e9ad6a775d63e59691fa..08635121750596ce1355ae2b3232bda370c44247 100644 (file)
--- a/drivers/platform/x86/msi-ec.h
+++ b/drivers/platform/x86/msi-ec.h
@@ -40,7 +40,7 @@ struct msi_ec_webcam_conf {
        int bit;
 };
 
-struct msi_ec_fn_super_swap_conf {
+struct msi_ec_fn_win_swap_conf {
        int address;
        int bit;
 };
@@ -108,7 +108,7 @@ struct msi_ec_conf {
 
        struct msi_ec_charge_control_conf charge_control;
        struct msi_ec_webcam_conf         webcam;
-       struct msi_ec_fn_super_swap_conf  fn_super_swap;
+       struct msi_ec_fn_win_swap_conf    fn_win_swap;
        struct msi_ec_cooler_boost_conf   cooler_boost;
        struct msi_ec_shift_mode_conf     shift_mode;
        struct msi_ec_super_battery_conf  super_battery;