| Message ID | 1469671937-13265-1-git-send-email-weiyj.lk@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Jul 27, 2016 at 7:12 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > 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 <weiyj.lk@gmail.com> > --- > drivers/net/phy/mdio-xgene.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c > index d94a978..7756748 100644 > --- a/drivers/net/phy/mdio-xgene.c > +++ b/drivers/net/phy/mdio-xgene.c > @@ -345,10 +345,8 @@ static int xgene_mdio_probe(struct platform_device *pdev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > csr_base = devm_ioremap_resource(dev, res); > - if (IS_ERR(csr_base)) { > - dev_err(dev, "Unable to retrieve mac CSR region\n"); > + if (IS_ERR(csr_base)) > return PTR_ERR(csr_base); > - } > pdata->mac_csr_addr = csr_base; > pdata->mdio_csr_addr = csr_base + BLOCK_XG_MDIO_CSR_OFFSET; > pdata->diag_csr_addr = csr_base + BLOCK_DIAG_CSR_OFFSET; > > > Thanks. Acked-By: Iyappan Subramanian <isubramanian@apm.com>
From: Wei Yongjun <weiyj.lk@gmail.com> Date: Thu, 28 Jul 2016 02:12:17 +0000 > 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 <weiyj.lk@gmail.com> Applied.
diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c index d94a978..7756748 100644 --- a/drivers/net/phy/mdio-xgene.c +++ b/drivers/net/phy/mdio-xgene.c @@ -345,10 +345,8 @@ static int xgene_mdio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); csr_base = devm_ioremap_resource(dev, res); - if (IS_ERR(csr_base)) { - dev_err(dev, "Unable to retrieve mac CSR region\n"); + if (IS_ERR(csr_base)) return PTR_ERR(csr_base); - } pdata->mac_csr_addr = csr_base; pdata->mdio_csr_addr = csr_base + BLOCK_XG_MDIO_CSR_OFFSET; pdata->diag_csr_addr = csr_base + BLOCK_DIAG_CSR_OFFSET;
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 <weiyj.lk@gmail.com> --- drivers/net/phy/mdio-xgene.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)