From patchwork Tue Apr 25 06:44:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 754592 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wBtwl6sZYz9s8F for ; Tue, 25 Apr 2017 16:44:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qgxaDLpr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S981026AbdDYGoQ (ORCPT ); Tue, 25 Apr 2017 02:44:16 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:32849 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S980899AbdDYGoM (ORCPT ); Tue, 25 Apr 2017 02:44:12 -0400 Received: by mail-pg0-f67.google.com with SMTP id 63so8866342pgh.0; Mon, 24 Apr 2017 23:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dGspNI66Tnkny/gSCFJTlkVu0EgfAPBL02fakgxenac=; b=qgxaDLpr5LptxJe2AN39LYhE1wh+QPXJynqSK5LMUmhrfqFPUY6wX86H4uFKjhQdHe 0U4kh1teG2SNYFD2++AI99A74qzWfDnS0oMxLdAfoF0w02H7/8+65wznLEj/8B7waSMQ oDWaclEku+yOfovvJaRBcyx94szQkOI2yUyPD7U7ZokrArkN2ySfl3oE2HzD3ji+Iqun 3SK+vOBRyAgOQT5Z6wNtAajS3jY2Ab7JZbH/woo8HqLBPfVV5PRT2YjkAOvg9NX/rrNL /w+0MrXEWpWcrPjIi8GuHqzT2zYw8kMKY6ySyIlalDlrvZQ0xVNlGU2MX3xFFainEMYD u2cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dGspNI66Tnkny/gSCFJTlkVu0EgfAPBL02fakgxenac=; b=P1ROUizviPwx6E4KSf4bfX10yuxkd274A9AEwFQml7wac0qMlDHeoobT5TFKyR00Yd 2jxLEzkWJCNl7Ev3W5J5IgGfyDE4HbgKXklCfY+O7EzL8HyxVYc7o4Vcfb5K6+V/y9IC sDVGplXGCDmr3t5CvKYT5HCuJuNdeI1MM684a89u1OrksxrsaGdn93dLrEutxxZGvCI9 J+ncp1bmPcLxKptWcCvFRd+Z3FTRxFoEzNbSB02SBpdusnL+JBu9BAYC4pvEhL6PUjuy KbA7uvnJfEejAPZ3aqcl29dJMnUNBRiy6Kku7lQKjPa1V+aSlGwjQdljxCtQaEm07Ild VZ3w== X-Gm-Message-State: AN3rC/7i/dCwfx+s6bayV7VULYASQk1WDqfLAVls/QIzituGTEmoatRr vFlw4Rm1/gH5pbgb8es= X-Received: by 10.98.223.200 with SMTP id d69mr28216746pfl.100.1493102652132; Mon, 24 Apr 2017 23:44:12 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id y5sm34436371pge.19.2017.04.24.23.44.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 23:44:11 -0700 (PDT) From: Wei Yongjun To: Wolfgang Grandegger , Marc Kleine-Budde , Anton Glukhov , Yegor Yefremov Cc: Wei Yongjun , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next] can: ti_hecc: fix return value check in ti_hecc_probe() Date: Tue, 25 Apr 2017 06:44:05 +0000 Message-Id: <20170425064405.3964-1-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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(). Fixes: dabf54dd1c63 ("can: ti_hecc: Convert TI HECC driver to DT only driver") Signed-off-by: Wei Yongjun --- drivers/net/can/ti_hecc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index b8aac53..4d49414 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c @@ -898,9 +898,9 @@ static int ti_hecc_probe(struct platform_device *pdev) } priv->base = devm_ioremap_resource(&pdev->dev, res); - if (!priv->base) { + if (IS_ERR(priv->base)) { dev_err(&pdev->dev, "hecc ioremap failed\n"); - return -ENOMEM; + return PTR_ERR(priv->base); } /* handle hecc-ram memory */ @@ -911,9 +911,9 @@ static int ti_hecc_probe(struct platform_device *pdev) } priv->hecc_ram = devm_ioremap_resource(&pdev->dev, res); - if (!priv->hecc_ram) { + if (IS_ERR(priv->hecc_ram)) { dev_err(&pdev->dev, "hecc-ram ioremap failed\n"); - return -ENOMEM; + return PTR_ERR(priv->hecc_ram); } /* handle mbx memory */ @@ -924,9 +924,9 @@ static int ti_hecc_probe(struct platform_device *pdev) } priv->mbx = devm_ioremap_resource(&pdev->dev, res); - if (!priv->mbx) { + if (IS_ERR(priv->mbx)) { dev_err(&pdev->dev, "mbx ioremap failed\n"); - return -ENOMEM; + return PTR_ERR(priv->mbx); } irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);