On Sat, 18 Jun 2016, weiyj...@163.com wrote: > From: Wei Yongjun <yongjun_...@trendmicro.com.cn> > > In case of error, the function devm_ioremap_resource() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). Also remove unneeded error handling of > platform_get_resource(). > > Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn> > --- > drivers/mfd/hi655x-pmic.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-)
Applied, thanks. > diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c > index 05ddc78..58bf149 100644 > --- a/drivers/mfd/hi655x-pmic.c > +++ b/drivers/mfd/hi655x-pmic.c > @@ -80,12 +80,9 @@ static int hi655x_pmic_probe(struct platform_device *pdev) > pmic->dev = dev; > > pmic->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!pmic->res) > - return -ENOENT; > - > base = devm_ioremap_resource(dev, pmic->res); > - if (!base) > - return -ENOMEM; > + if (IS_ERR(base)) > + return PTR_ERR(base); > > pmic->regmap = devm_regmap_init_mmio_clk(dev, NULL, base, > &hi655x_regmap_config); > > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
