Skip to content

Commit ff54dc3

Browse files
teackotij-intel
authored andcommitted
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>
1 parent 378f2b6 commit ff54dc3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

drivers/platform/x86/msi-ec.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static struct msi_ec_conf CONF0 __initdata = {
5858
.block_address = 0x2f,
5959
.bit = 1,
6060
},
61-
.fn_super_swap = {
61+
.fn_win_swap = {
6262
.address = 0xbf,
6363
.bit = 4,
6464
},
@@ -138,7 +138,7 @@ static struct msi_ec_conf CONF1 __initdata = {
138138
.block_address = 0x2f,
139139
.bit = 1,
140140
},
141-
.fn_super_swap = {
141+
.fn_win_swap = {
142142
.address = 0xbf,
143143
.bit = 4,
144144
},
@@ -215,7 +215,7 @@ static struct msi_ec_conf CONF2 __initdata = {
215215
.block_address = 0x2f,
216216
.bit = 1,
217217
},
218-
.fn_super_swap = {
218+
.fn_win_swap = {
219219
.address = 0xe8,
220220
.bit = 4,
221221
},
@@ -294,7 +294,7 @@ static struct msi_ec_conf CONF3 __initdata = {
294294
.block_address = 0x2f,
295295
.bit = 1,
296296
},
297-
.fn_super_swap = {
297+
.fn_win_swap = {
298298
.address = 0xe8,
299299
.bit = 4,
300300
},
@@ -372,7 +372,7 @@ static struct msi_ec_conf CONF4 __initdata = {
372372
.block_address = 0x2f,
373373
.bit = 1,
374374
},
375-
.fn_super_swap = {
375+
.fn_win_swap = {
376376
.address = MSI_EC_ADDR_UNKNOWN, // supported, but unknown
377377
.bit = 4,
378378
},
@@ -451,7 +451,7 @@ static struct msi_ec_conf CONF5 __initdata = {
451451
.block_address = 0x2f,
452452
.bit = 1,
453453
},
454-
.fn_super_swap = { // todo: reverse
454+
.fn_win_swap = { // todo: reverse
455455
.address = 0xbf,
456456
.bit = 4,
457457
},
@@ -529,7 +529,7 @@ static struct msi_ec_conf CONF6 __initdata = {
529529
.block_address = MSI_EC_ADDR_UNSUPP,
530530
.bit = 1,
531531
},
532-
.fn_super_swap = {
532+
.fn_win_swap = {
533533
.address = 0xbf, // todo: reverse
534534
.bit = 4,
535535
},
@@ -609,7 +609,7 @@ static struct msi_ec_conf CONF7 __initdata = {
609609
.block_address = MSI_EC_ADDR_UNSUPP,
610610
.bit = 1,
611611
},
612-
.fn_super_swap = {
612+
.fn_win_swap = {
613613
.address = 0xbf, // needs testing
614614
.bit = 4,
615615
},

drivers/platform/x86/msi-ec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct msi_ec_webcam_conf {
4040
int bit;
4141
};
4242

43-
struct msi_ec_fn_super_swap_conf {
43+
struct msi_ec_fn_win_swap_conf {
4444
int address;
4545
int bit;
4646
};
@@ -108,7 +108,7 @@ struct msi_ec_conf {
108108

109109
struct msi_ec_charge_control_conf charge_control;
110110
struct msi_ec_webcam_conf webcam;
111-
struct msi_ec_fn_super_swap_conf fn_super_swap;
111+
struct msi_ec_fn_win_swap_conf fn_win_swap;
112112
struct msi_ec_cooler_boost_conf cooler_boost;
113113
struct msi_ec_shift_mode_conf shift_mode;
114114
struct msi_ec_super_battery_conf super_battery;

0 commit comments

Comments
 (0)