pinctrl: lakefield: Switch to INTEL_GPP() macro

Replace custom macro with the recently defined INTEL_GPP().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-lakefield.c b/drivers/pinctrl/intel/pinctrl-lakefield.c
index 60281f4216085fa1b72f710ed05da6bfec987ce0..bfb8b565d15c1a36cb258698273efc669370e109 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-lakefield.c
+++ b/drivers/pinctrl/intel/pinctrl-lakefield.c
@@ -21,14 +21,6 @@
 #define LKF_GPI_IS     0x100
 #define LKF_GPI_IE     0x110
 
-#define LKF_GPP(r, s, e, g)                            \
-       {                                               \
-               .reg_num = (r),                         \
-               .base = (s),                            \
-               .size = ((e) - (s) + 1),                \
-               .gpio_base = (g),                       \
-       }
-
 #define LKF_COMMUNITY(b, s, e, g)                      \
        INTEL_COMMUNITY_GPPS(b, s, e, g, LKF)
 
@@ -308,24 +300,24 @@ static const struct pinctrl_pin_desc lkf_pins[] = {
 };
 
 static const struct intel_padgroup lkf_community0_gpps[] = {
-       LKF_GPP(0, 0, 31, 0),           /* EAST_0 */
-       LKF_GPP(1, 32, 59, 32),         /* EAST_1 */
+       INTEL_GPP(0, 0, 31, 0),         /* EAST_0 */
+       INTEL_GPP(1, 32, 59, 32),       /* EAST_1 */
 };
 
 static const struct intel_padgroup lkf_community1_gpps[] = {
-       LKF_GPP(0, 60, 91, 64),         /* NORTHWEST_0 */
-       LKF_GPP(1, 92, 123, 96),        /* NORTHWEST_1 */
-       LKF_GPP(2, 124, 148, 128),      /* NORTHWEST_2 */
+       INTEL_GPP(0, 60, 91, 64),       /* NORTHWEST_0 */
+       INTEL_GPP(1, 92, 123, 96),      /* NORTHWEST_1 */
+       INTEL_GPP(2, 124, 148, 128),    /* NORTHWEST_2 */
 };
 
 static const struct intel_padgroup lkf_community2_gpps[] = {
-       LKF_GPP(0, 149, 180, 160),      /* WEST_0 */
-       LKF_GPP(1, 181, 212, 192),      /* WEST_1 */
-       LKF_GPP(2, 213, 237, 224),      /* WEST_2 */
+       INTEL_GPP(0, 149, 180, 160),    /* WEST_0 */
+       INTEL_GPP(1, 181, 212, 192),    /* WEST_1 */
+       INTEL_GPP(2, 213, 237, 224),    /* WEST_2 */
 };
 
 static const struct intel_padgroup lkf_community3_gpps[] = {
-       LKF_GPP(0, 238, 266, 256),      /* SOUTHEAST */
+       INTEL_GPP(0, 238, 266, 256),    /* SOUTHEAST */
 };
 
 static const struct intel_community lkf_communities[] = {