6 files changed, 12 insertions, 24 deletions
diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c
index dc54845600..f4d02412eb 100644
--- a/src/soc/intel/alderlake/chip.c
+++ b/src/soc/intel/alderlake/chip.c
@@ -116,11 +116,9 @@ static void soc_fill_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }
diff --git a/src/soc/intel/cannonlake/gpio_common.c b/src/soc/intel/cannonlake/gpio_common.c
index 2c2dcdbabd..4307260cd1 100644
--- a/src/soc/intel/cannonlake/gpio_common.c
+++ b/src/soc/intel/cannonlake/gpio_common.c
@@ -14,11 +14,9 @@ void soc_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-				TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-				TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }
diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c
index 3917ea0af8..ad634819f2 100644
--- a/src/soc/intel/elkhartlake/chip.c
+++ b/src/soc/intel/elkhartlake/chip.c
@@ -105,11 +105,9 @@ static void soc_fill_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index 32b1830096..05f42b4e7a 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -95,11 +95,9 @@ static void soc_fill_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }
diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c
index ea29fd8b43..a8e3c88128 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -111,11 +111,9 @@ static void soc_fill_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index 1affcce078..eefc408bc2 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -116,11 +116,9 @@ static void soc_fill_gpio_pm_configuration(void)
 	const config_t *config = config_of_soc();
 
 	if (config->gpio_override_pm)
-		memcpy(value, config->gpio_pm, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memcpy(value, config->gpio_pm, sizeof(value));
 	else
-		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(uint8_t) *
-			TOTAL_GPIO_COMM);
+		memset(value, MISCCFG_GPIO_PM_CONFIG_BITS, sizeof(value));
 
 	gpio_pm_configure(value, TOTAL_GPIO_COMM);
 }