| Message ID | 20240731201703.1842022-2-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46e6acfe3501fa938af9c5bd730f0020235b08a2 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: phy: qca807x: Drop unnecessary and broken DT validation | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 31 Jul 2024 14:17:03 -0600 you wrote: > The check for "leds" and "gpio-controller" both being present is never > true because "leds" is a node, not a property. This could be fixed > with a check for child node, but there's really no need for the kernel > to validate a DT. Just continue ignoring the LEDs if GPIOs are present. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > > [...] Here is the summary with links: - [net-next] net: phy: qca807x: Drop unnecessary and broken DT validation https://git.kernel.org/netdev/net-next/c/46e6acfe3501 You are awesome, thank you!
diff --git a/drivers/net/phy/qcom/qca807x.c b/drivers/net/phy/qcom/qca807x.c index 672c6929119a..ba558486c72f 100644 --- a/drivers/net/phy/qcom/qca807x.c +++ b/drivers/net/phy/qcom/qca807x.c @@ -733,16 +733,6 @@ static int qca807x_probe(struct phy_device *phydev) "qcom,dac-disable-bias-current-tweak"); #if IS_ENABLED(CONFIG_GPIOLIB) - /* Make sure we don't have mixed leds node and gpio-controller - * to prevent registering leds and having gpio-controller usage - * conflicting with them. - */ - if (of_find_property(node, "leds", NULL) && - of_find_property(node, "gpio-controller", NULL)) { - phydev_err(phydev, "Invalid property detected. LEDs and gpio-controller are mutually exclusive."); - return -EINVAL; - } - /* Do not register a GPIO controller unless flagged for it */ if (of_property_read_bool(node, "gpio-controller")) { ret = qca807x_gpio(phydev);
The check for "leds" and "gpio-controller" both being present is never true because "leds" is a node, not a property. This could be fixed with a check for child node, but there's really no need for the kernel to validate a DT. Just continue ignoring the LEDs if GPIOs are present. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- drivers/net/phy/qcom/qca807x.c | 10 ---------- 1 file changed, 10 deletions(-)