| Message ID | 20170425063446.32726-1-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25 April 2017 at 08:34, 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> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci-xenon-phy.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c > index 4bdbcd3..d43841e 100644 > --- a/drivers/mmc/host/sdhci-xenon-phy.c > +++ b/drivers/mmc/host/sdhci-xenon-phy.c > @@ -639,11 +639,8 @@ static int get_dt_pad_ctrl_data(struct sdhci_host *host, > > params->pad_ctrl.reg = devm_ioremap_resource(mmc_dev(host->mmc), > &iomem); > - if (IS_ERR(params->pad_ctrl.reg)) { > - dev_err(mmc_dev(host->mmc), "Unable to get SoC PHY PAD ctrl register for %s\n", > - np->name); > + if (IS_ERR(params->pad_ctrl.reg)) > return PTR_ERR(params->pad_ctrl.reg); > - } > > ret = of_property_read_string(np, "marvell,pad-type", &name); > if (ret) { > > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" 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/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c index 4bdbcd3..d43841e 100644 --- a/drivers/mmc/host/sdhci-xenon-phy.c +++ b/drivers/mmc/host/sdhci-xenon-phy.c @@ -639,11 +639,8 @@ static int get_dt_pad_ctrl_data(struct sdhci_host *host, params->pad_ctrl.reg = devm_ioremap_resource(mmc_dev(host->mmc), &iomem); - if (IS_ERR(params->pad_ctrl.reg)) { - dev_err(mmc_dev(host->mmc), "Unable to get SoC PHY PAD ctrl register for %s\n", - np->name); + if (IS_ERR(params->pad_ctrl.reg)) return PTR_ERR(params->pad_ctrl.reg); - } ret = of_property_read_string(np, "marvell,pad-type", &name); if (ret) {