.gpio_base = (g),                       \
        }
 
-#define CNL_COMMUNITY(b, s, e, ho, g)                  \
+#define CNL_COMMUNITY(b, s, e, g, v)                   \
        {                                               \
                .barno = (b),                           \
                .padown_offset = CNL_PAD_OWN,           \
                .padcfglock_offset = CNL_PADCFGLOCK,    \
-               .hostown_offset = (ho),                 \
+               .hostown_offset = CNL_##v##_HOSTSW_OWN, \
                .is_offset = CNL_GPI_IS,                \
                .ie_offset = CNL_GPI_IE,                \
                .pin_base = (s),                        \
        }
 
 #define CNL_LP_COMMUNITY(b, s, e, g)                   \
-       CNL_COMMUNITY(b, s, e, CNL_LP_HOSTSW_OWN, g)
+       CNL_COMMUNITY(b, s, e, g, LP)
 
 #define CNL_H_COMMUNITY(b, s, e, g)                    \
-       CNL_COMMUNITY(b, s, e, CNL_H_HOSTSW_OWN, g)
+       CNL_COMMUNITY(b, s, e, g, H)
 
 /* Cannon Lake-H */
 static const struct pinctrl_pin_desc cnlh_pins[] = {