| Message ID | 1469671753-12961-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 28, 2016 at 02:09:13AM +0000, Wei Yongjun wrote: > There is a error message within devm_ioremap_resource > already, so remove the DRM_ERROR call to avoid redundant > error message. Yeah, good catch! > > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Thanks for the cleanup! Liviu > --- > drivers/gpu/drm/arm/malidp_drv.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index 4e61ea5..1160322 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -285,10 +285,8 @@ static int malidp_bind(struct device *dev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > hwdev->regs = devm_ioremap_resource(dev, res); > - if (IS_ERR(hwdev->regs)) { > - DRM_ERROR("Failed to map control registers area\n"); > + if (IS_ERR(hwdev->regs)) > return PTR_ERR(hwdev->regs); > - } > > hwdev->pclk = devm_clk_get(dev, "pclk"); > if (IS_ERR(hwdev->pclk)) >
On Thu, Jul 28, 2016 at 09:11:43AM +0100, Liviu Dudau wrote: > On Thu, Jul 28, 2016 at 02:09:13AM +0000, Wei Yongjun wrote: > > There is a error message within devm_ioremap_resource > > already, so remove the DRM_ERROR call to avoid redundant > > error message. > > Yeah, good catch! > > > > > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> > > Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Applied to drm-misc, thanks. -Daniel > > > Thanks for the cleanup! > Liviu > > > --- > > drivers/gpu/drm/arm/malidp_drv.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > > index 4e61ea5..1160322 100644 > > --- a/drivers/gpu/drm/arm/malidp_drv.c > > +++ b/drivers/gpu/drm/arm/malidp_drv.c > > @@ -285,10 +285,8 @@ static int malidp_bind(struct device *dev) > > > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > hwdev->regs = devm_ioremap_resource(dev, res); > > - if (IS_ERR(hwdev->regs)) { > > - DRM_ERROR("Failed to map control registers area\n"); > > + if (IS_ERR(hwdev->regs)) > > return PTR_ERR(hwdev->regs); > > - } > > > > hwdev->pclk = devm_clk_get(dev, "pclk"); > > if (IS_ERR(hwdev->pclk)) > > > > -- > ==================== > | I would like to | > | fix the world, | > | but they're not | > | giving me the | > \ source code! / > --------------- > ¯\_(ツ)_/¯ > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 4e61ea5..1160322 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -285,10 +285,8 @@ static int malidp_bind(struct device *dev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); hwdev->regs = devm_ioremap_resource(dev, res); - if (IS_ERR(hwdev->regs)) { - DRM_ERROR("Failed to map control registers area\n"); + if (IS_ERR(hwdev->regs)) return PTR_ERR(hwdev->regs); - } hwdev->pclk = devm_clk_get(dev, "pclk"); if (IS_ERR(hwdev->pclk))
There is a error message within devm_ioremap_resource already, so remove the DRM_ERROR call to avoid redundant error message. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> --- drivers/gpu/drm/arm/malidp_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)