| Message ID | 20210920095218.1108151-2-horatiu.vultur@microchip.com |
|---|---|
| State | RFC |
| Headers | show |
| Series | Add lan966x driver | expand |
On Mon, Sep 20, 2021 at 11:52:07AM +0200, Horatiu Vultur wrote: > According to the documentation the second resource is optional. But the > blamed commit ignores that and if the resource is not there it just > fails. > > This patch reverts that to still allow the second resource to be > optional because other SoC have the some MDIO controller and doesn't > need to second resource. > > Fixes: 672a1c394950 ("net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource()") > Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> Hi Moratiu The script kiddies might come long and 'fix' this again. Maybe consider adding devm_platform_ioremap_resource_optional(), following the pattern of other _optional() API calls. Otherwise add a comment. Andrew
The 09/20/2021 13:52, Andrew Lunn wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Mon, Sep 20, 2021 at 11:52:07AM +0200, Horatiu Vultur wrote: > > According to the documentation the second resource is optional. But the > > blamed commit ignores that and if the resource is not there it just > > fails. > > > > This patch reverts that to still allow the second resource to be > > optional because other SoC have the some MDIO controller and doesn't > > need to second resource. > > > > Fixes: 672a1c394950 ("net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource()") > > Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> Hi Andrew, > > Hi Moratiu > > The script kiddies might come long and 'fix' this again. Maybe > consider adding devm_platform_ioremap_resource_optional(), following > the pattern of other _optional() API calls. Otherwise add a comment. Initially I think I will go with the comment. Because this patch actually needs to go on net. > > Andrew
diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c index 1ee592d3eae4..bef026a80074 100644 --- a/drivers/net/mdio/mdio-mscc-miim.c +++ b/drivers/net/mdio/mdio-mscc-miim.c @@ -134,8 +134,9 @@ static int mscc_miim_reset(struct mii_bus *bus) static int mscc_miim_probe(struct platform_device *pdev) { - struct mii_bus *bus; struct mscc_miim_dev *dev; + struct resource *res; + struct mii_bus *bus; int ret; bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*dev)); @@ -156,10 +157,13 @@ static int mscc_miim_probe(struct platform_device *pdev) return PTR_ERR(dev->regs); } - dev->phy_regs = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(dev->phy_regs)) { - dev_err(&pdev->dev, "Unable to map internal phy registers\n"); - return PTR_ERR(dev->phy_regs); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + dev->phy_regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(dev->phy_regs)) { + dev_err(&pdev->dev, "Unable to map internal phy registers\n"); + return PTR_ERR(dev->phy_regs); + } } ret = of_mdiobus_register(bus, pdev->dev.of_node);
According to the documentation the second resource is optional. But the blamed commit ignores that and if the resource is not there it just fails. This patch reverts that to still allow the second resource to be optional because other SoC have the some MDIO controller and doesn't need to second resource. Fixes: 672a1c394950 ("net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource()") Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- drivers/net/mdio/mdio-mscc-miim.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)