diff --git a/drivers/pinctrl/pinctrl-equilibrium.c b/drivers/pinctrl/pinctrl-equilibrium.c index 63d425ea1c0a7e0eb1221d73ebe2cafc4848cf97..fa82bad24da6cd00e6949f070de115e2b488171c 100644 --- a/drivers/pinctrl/pinctrl-equilibrium.c +++ b/drivers/pinctrl/pinctrl-equilibrium.c @@ -764,7 +764,6 @@ static const struct pinmux_ops eqbr_pinmux_ops = { .get_function_groups = eqbr_pinmux_get_groups, .set_mux = eqbr_pinmux_set_mux, .gpio_request_enable = eqbr_pinmux_gpio_request, - .strict = 1, }; static void set_drv_cur(void __iomem *mem, unsigned int offset, @@ -1352,8 +1351,8 @@ static int pinbank_probe(struct intel_pinctrl_drv_data *drvdata) for_each_child_of_node(np_pad, np_bank) { if (of_find_property(np_bank, PINBANK_PROPERTY, NULL)) { status = of_get_property(np_bank, "status", &len); - if (status != NULL && len > 0 - && strcmp(status, "disabled") == 0) + if (status && len > 0 && + strcmp(status, "disabled") == 0) continue; nr_bank++; if (of_find_property(np_bank, PINBANK_GPIO_CTRL, NULL)) @@ -1390,8 +1389,8 @@ static int pinbank_probe(struct intel_pinctrl_drv_data *drvdata) for_each_child_of_node(np_pad, np_bank) { if (of_find_property(np_bank, PINBANK_PROPERTY, NULL)) { status = of_get_property(np_bank, "status", &len); - if (status != NULL && len > 0 - && strcmp(status, "disabled") == 0) + if (status && len > 0 && + strcmp(status, "disabled") == 0) continue; pinbank_init(np_bank, drvdata, banks + i, i); @@ -1436,7 +1435,7 @@ static void dbg_print_inited_pin(struct intel_pinctrl_drv_data *drvdata) mux = readl(bank->membase + pin * 4); if (mux != PINMUX_GPIO) dev_dbg(dev, "PIN %u has been set to %u\n", - bank->pin_base + pin, mux); + bank->pin_base + pin, mux); } } }