diff mbox

[-next] ASoC: samsung: Fix return value check in s3c2412_iis_dev_probe()

Message ID 1405827787-26055-1-git-send-email-weiyj_lk@163.com (mailing list archive)
State Accepted
Commit 71864b22f50ceab0025ae2a1cd81b956878ded2b
Headers show

Commit Message

weiyj_lk@163.com July 20, 2014, 3:43 a.m. UTC 
From: Wei Yongjun <yongjun_wei@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 redundant return value check of
platform_get_resource().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 sound/soc/samsung/s3c2412-i2s.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Mark Brown July 29, 2014, 6:56 p.m. UTC | #1 
On Sun, Jul 20, 2014 at 11:43:07AM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@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 redundant return value check of
> platform_get_resource().

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 9180310..27b339c 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -154,13 +154,9 @@  static int s3c2412_iis_dev_probe(struct platform_device *pdev)
 	struct resource *res;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "Can't get IO resource.\n");
-		return -ENOENT;
-	}
 	s3c2412_i2s.regs = devm_ioremap_resource(&pdev->dev, res);
-	if (s3c2412_i2s.regs == NULL)
-		return -ENXIO;
+	if (IS_ERR(s3c2412_i2s.regs))
+		return PTR_ERR(s3c2412_i2s.regs);
 
 	s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD;
 	s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD;