From 4e553f31fa43efe0272f2e26935e2cbaf4f0c1fb Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Sat, 4 Apr 2020 09:45:09 -0500
Subject: [PATCH] drivers: gpio: use new ngpios macros for cases embedded in
 macros

Fixup cases of GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(n, ngpios))
to use GPIO_PORT_PIN_MASK_FROM_DT_INST(n) instead.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 drivers/gpio/gpio_cmsdk_ahb.c | 5 +----
 drivers/gpio/gpio_esp32.c     | 2 +-
 drivers/gpio/gpio_imx.c       | 2 +-
 drivers/gpio/gpio_lmp90xxx.c  | 3 +--
 drivers/gpio/gpio_pca95xx.c   | 2 +-
 drivers/gpio/gpio_stellaris.c | 5 +----
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index 8d61f0ce2fb..800cec1f2b6 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -269,15 +269,12 @@ static int gpio_cmsdk_ahb_init(struct device *dev)
 	return 0;
 }
 
-#define PORT_PIN_MASK(n) \
-	GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(n, ngpios))
-
 #define CMSDK_AHB_GPIO_DEVICE(n)						\
 	static void gpio_cmsdk_port_##n##_config_func(struct device *dev);	\
 										\
 	static const struct gpio_cmsdk_ahb_cfg gpio_cmsdk_port_##n##_config = {	\
 		.common = {							\
-			.port_pin_mask = PORT_PIN_MASK(n),			\
+			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n),	\
 		},								\
 		.port = ((volatile struct gpio_cmsdk_ahb *)DT_INST_REG_ADDR(n)),\
 		.gpio_config_func = gpio_cmsdk_port_##n##_config_func,		\
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index 6b9d68a3955..61eb910db6c 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -363,7 +363,7 @@ static struct gpio_esp32_data gpio_1_data = { /* 32..39 */
 
 #define GPIO_DEVICE_INIT(_id) \
 	static struct gpio_driver_config gpio_##_id##_cfg = { \
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(_id, ngpios)),\
+		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(_id),  \
 	}; \
 	DEVICE_AND_API_INIT(gpio_esp32_##_id,				\
 			    DT_INST_LABEL(_id),	\
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index e4c9a542507..88fda568518 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -243,7 +243,7 @@ static const struct gpio_driver_api imx_gpio_driver_api = {
 	static const struct imx_gpio_config imx_gpio_##n##_config = {	\
 		.common = {						\
 			.port_pin_mask =				\
-				GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(n, ngpios)), \
+				GPIO_PORT_PIN_MASK_FROM_DT_INST(n),	\
 		},							\
 		.base = (GPIO_Type *)DT_INST_REG_ADDR(n),		\
 	};								\
diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c
index da1ca9c27af..471892fc8ce 100644
--- a/drivers/gpio/gpio_lmp90xxx.c
+++ b/drivers/gpio/gpio_lmp90xxx.c
@@ -170,8 +170,7 @@ BUILD_ASSERT(CONFIG_GPIO_LMP90XXX_INIT_PRIORITY >
 	static const struct gpio_lmp90xxx_config gpio_lmp90xxx_##id##_cfg = {\
 		.common = {                                             \
 			.port_pin_mask =                                \
-				 GPIO_PORT_PIN_MASK_FROM_NGPIOS(        \
-					DT_INST_PROP(id, ngpios))	\
+				 GPIO_PORT_PIN_MASK_FROM_DT_INST(id)	\
 		},                                                      \
 		.parent_dev_name = DT_INST_BUS_LABEL(id),		\
 	};								\
diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c
index c95525fd29b..00b7c318cf1 100644
--- a/drivers/gpio/gpio_pca95xx.c
+++ b/drivers/gpio/gpio_pca95xx.c
@@ -491,7 +491,7 @@ static int gpio_pca95xx_init(struct device *dev)
 #define GPIO_PCA95XX_DEVICE_INSTANCE(inst)				\
 static const struct gpio_pca95xx_config gpio_pca95xx_##inst##_cfg = {	\
 	.common = {							\
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(inst, ngpios)), \
+		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(inst),	\
 	},								\
 	.i2c_master_dev_name = DT_INST_BUS_LABEL(inst),	\
 	.i2c_slave_addr = DT_INST_REG_ADDR(inst),	\
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index 7594a17304c..031528498ca 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -255,9 +255,6 @@ static const struct gpio_driver_api gpio_stellaris_driver_api = {
 	.disable_callback = gpio_stellaris_disable_callback,
 };
 
-#define PORT_PIN_MASK(n) \
-	GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_PROP(n, ngpios))
-
 #define STELLARIS_GPIO_DEVICE(n)							\
 	static void port_## n ##_stellaris_config_func(struct device *dev);		\
 											\
@@ -265,7 +262,7 @@ static const struct gpio_driver_api gpio_stellaris_driver_api = {
 											\
 	static const struct gpio_stellaris_config gpio_stellaris_port_## n ##_config = {\
 		.common = {								\
-			.port_pin_mask = PORT_PIN_MASK(n),				\
+			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n),		\
 		},									\
 		.base = DT_INST_REG_ADDR(n),			\
 		.port_map = BIT_MASK(DT_INST_PROP(n, ngpios)),		\