| Message ID | 1476716173-31310-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Oct 17, 2016 at 10:56 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > There is a error message within devm_ioremap_resource > already, so remove the dev_err call to avoid redundant > error message. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/pci/host/pcie-altera.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c > index b0ac4df..8be45a8 100644 > --- a/drivers/pci/host/pcie-altera.c > +++ b/drivers/pci/host/pcie-altera.c > @@ -550,10 +550,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) > > cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra"); > pcie->cra_base = devm_ioremap_resource(dev, cra); > - if (IS_ERR(pcie->cra_base)) { > - dev_err(dev, "failed to map cra memory\n"); > + if (IS_ERR(pcie->cra_base)) > return PTR_ERR(pcie->cra_base); > - } > > /* setup IRQ */ > pcie->irq = platform_get_irq(pdev, 0); > Acked-by: Ley Foon Tan <lftan@altera.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 17, 2016 at 02:56:13PM +0000, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > There is a error message within devm_ioremap_resource > already, so remove the dev_err call to avoid redundant > error message. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied with Ley Foon Tan's ack to pci/host-altera for v4.10, thanks! > --- > drivers/pci/host/pcie-altera.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c > index b0ac4df..8be45a8 100644 > --- a/drivers/pci/host/pcie-altera.c > +++ b/drivers/pci/host/pcie-altera.c > @@ -550,10 +550,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) > > cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra"); > pcie->cra_base = devm_ioremap_resource(dev, cra); > - if (IS_ERR(pcie->cra_base)) { > - dev_err(dev, "failed to map cra memory\n"); > + if (IS_ERR(pcie->cra_base)) > return PTR_ERR(pcie->cra_base); > - } > > /* setup IRQ */ > pcie->irq = platform_get_irq(pdev, 0); > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c index b0ac4df..8be45a8 100644 --- a/drivers/pci/host/pcie-altera.c +++ b/drivers/pci/host/pcie-altera.c @@ -550,10 +550,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra"); pcie->cra_base = devm_ioremap_resource(dev, cra); - if (IS_ERR(pcie->cra_base)) { - dev_err(dev, "failed to map cra memory\n"); + if (IS_ERR(pcie->cra_base)) return PTR_ERR(pcie->cra_base); - } /* setup IRQ */ pcie->irq = platform_get_irq(pdev, 0);