From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbcFRR0x (ORCPT ); Sat, 18 Jun 2016 13:26:53 -0400 Received: from m12-13.163.com ([220.181.12.13]:52006 "EHLO m12-13.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258AbcFRR0v (ORCPT ); Sat, 18 Jun 2016 13:26:51 -0400 From: weiyj_lk@163.com To: Lee Jones Cc: Wei Yongjun , linux-kernel@vger.kernel.org Subject: [PATCH -next] mfd: hi655x: Fix return value check in hi655x_pmic_probe() Date: Sat, 18 Jun 2016 17:26:07 +0000 Message-Id: <1466270767-3888-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CM-TRANSID: DcCowAD3_bovhGVXbrACAQ--.3593S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kAFWDXryfZF1kWr4DArb_yoWDtrc_G3 y5urn7JrykGFy7tFWqv398CryfAFykWrZYqF1Yyas3tw4qyr1UGryDur98ZrWfua1DAr1D Kry3Xr1xAr13CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUe0ksDUUUUU== X-Originating-IP: [180.102.97.65] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiNRGM1lSIOU0oegAAsE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun 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 --- drivers/mfd/hi655x-pmic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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);