Message ID | 20240930091111.32010-2-brgl@bgdev.pl |
---|---|
State | New |
Headers | show |
Series | None | expand |
Hello Bart, On Mon, Sep 30, 2024 at 11:11:11AM +0200, Bartosz Golaszewski wrote: > diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c > index 8cfd3a89c018..5ffb332e9849 100644 > --- a/drivers/gpio/gpio-mvebu.c > +++ b/drivers/gpio/gpio-mvebu.c > @@ -794,8 +794,8 @@ static int mvebu_pwm_probe(struct platform_device *pdev, > u32 set; > > if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) { > - int ret = of_property_read_u32(dev->of_node, > - "marvell,pwm-offset", &offset); > + int ret = device_property_read_u32(dev, "marvell,pwm-offset", > + &offset); > if (ret < 0) > return 0; > } else { > @@ -1106,7 +1106,7 @@ static int mvebu_gpio_probe_syscon(struct platform_device *pdev, > if (IS_ERR(mvchip->regs)) > return PTR_ERR(mvchip->regs); > > - if (of_property_read_u32(pdev->dev.of_node, "offset", &mvchip->offset)) > + if (device_property_read_u32(&pdev->dev, "offset", &mvchip->offset)) > return -EINVAL; > > return 0; > @@ -1147,7 +1147,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, mvchip); > > - if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) { > + if (device_property_read_u32(&pdev->dev, "ngpios", &ngpios)) { > dev_err(&pdev->dev, "Missing ngpios OF property\n"); > return -ENODEV; > } I didn't look closely, but I wonder if GPIO_MVEBU depending on OF_GPIO can be softened with this change?! Best regards Uwe
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 8cfd3a89c018..5ffb332e9849 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -794,8 +794,8 @@ static int mvebu_pwm_probe(struct platform_device *pdev, u32 set; if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) { - int ret = of_property_read_u32(dev->of_node, - "marvell,pwm-offset", &offset); + int ret = device_property_read_u32(dev, "marvell,pwm-offset", + &offset); if (ret < 0) return 0; } else { @@ -1106,7 +1106,7 @@ static int mvebu_gpio_probe_syscon(struct platform_device *pdev, if (IS_ERR(mvchip->regs)) return PTR_ERR(mvchip->regs); - if (of_property_read_u32(pdev->dev.of_node, "offset", &mvchip->offset)) + if (device_property_read_u32(&pdev->dev, "offset", &mvchip->offset)) return -EINVAL; return 0; @@ -1147,7 +1147,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mvchip); - if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) { + if (device_property_read_u32(&pdev->dev, "ngpios", &ngpios)) { dev_err(&pdev->dev, "Missing ngpios OF property\n"); return -ENODEV; }