On 10 June 2013 17:05, Tushar Behera <tushar.behera@xxxxxxxxxx> wrote: > Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") > introduced devm_ioremap_resource() and deprecated the use of > devm_request_and_ioremap(). > > Signed-off-by: Tushar Behera <tushar.behera@xxxxxxxxxx> > CC: linux-pci@xxxxxxxxxxxxxxx > CC: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > --- > drivers/pci/host/pci-mvebu.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c > index 13a633b..e714876 100644 > --- a/drivers/pci/host/pci-mvebu.c > +++ b/drivers/pci/host/pci-mvebu.c > @@ -752,7 +752,7 @@ mvebu_pcie_map_registers(struct platform_device *pdev, > if (ret) > return NULL; > > - return devm_request_and_ioremap(&pdev->dev, ®s); > + return devm_ioremap_resource(&pdev->dev, ®s); > } > > static int __init mvebu_pcie_probe(struct platform_device *pdev) > @@ -842,9 +842,10 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) > continue; > > port->base = mvebu_pcie_map_registers(pdev, child, port); > - if (!port->base) { > + if (IS_ERR(port->base)) { > dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n", > port->port, port->lane); This error message is redundant. > + port->base = NULL; Probably this is also not needed. > continue; > } > > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html