Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp322512ybz; Wed, 29 Apr 2020 00:31:29 -0700 (PDT) X-Google-Smtp-Source: APiQypKPSjL1s0Lin+l7lbgpzu/uP1/6DavnMm0KYY4RPH1he9yaUfnPYpzntfrXY0eSBcFqdKeW X-Received: by 2002:a50:f005:: with SMTP id r5mr1139852edl.376.1588145488899; Wed, 29 Apr 2020 00:31:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588145488; cv=none; d=google.com; s=arc-20160816; b=sPWP0aX3rh+JeLdEg6Z8Cu1ajMaWGjdtzBVEXtzd3KCC4RQDOjMUKj+liRytFq4jF0 Q3H0qWfLJO/Qo4T2nJDQTwvgLSEyEHM9CwBA4zS3PPCm06FHIvhdlclyvto4Fj1Ep13O fjeerE1liifze2bYOz4RZWSBewQUemXLN/F+B9S0dsLPzNwbha3kaIlCR1mWBsHJYO4s k4rMkIXK5RULltRKNG6s38AFpobI4D9BCJzgOEVwIepR8LtKlzZUo004LCX/71UEdjPg 9utWcJQc/Col4u93m4kZdo/yh70mjIY1ICdHiJI+VoxqgE4aoS8vFU278AScfiKhqjGz 01lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=8469lBOgdaO8hfaCev/MMz5SjCxR/6IZfGMBJS7R1Vk=; b=ZmbOFERBhI/uHKOUuEAS2hY2gJj2v2Czu/Q4XRHb9osWrpfjAlsD8u+c1zfCUa72XS tRYYjK0hRW9Rmh5temkcUkW6iqWenjn4nxtIUi1m/QWho05MgwLbcEFitspdKQaKmqvX EvTaYjYuF5Jlc7nCgF3VvmWXrLyjKNs/Fz2AMb3Llo63KBxVBkYRBiJqh+N9UmiVcSAH a8nB7gzDuEtxPxGbdtNV8Tkle0xvEKVd0UKm38KqkyrXvl9fxM7RGj5AzEzVL5Y8VXRX O6CsGjxFTgTdFdikcIAEWNvv4dNcgeOO0Y/oHVEhmlaAfRHfAH+cm+z0yAdVkxhfI9fS E5TQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j24si2503446ejd.432.2020.04.29.00.31.05; Wed, 29 Apr 2020 00:31:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726554AbgD2H3R (ORCPT + 99 others); Wed, 29 Apr 2020 03:29:17 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3335 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726355AbgD2H3R (ORCPT ); Wed, 29 Apr 2020 03:29:17 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 5D70739FAA5FA094E860; Wed, 29 Apr 2020 15:29:13 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Wed, 29 Apr 2020 15:29:06 +0800 From: Wei Yongjun To: Jassi Brar , Michal Simek , Wendy Liang CC: Wei Yongjun , , , Subject: [PATCH -next] mailbox: Fix NULL vs IS_ERR() check in zynqmp_ipi_mbox_probe() Date: Wed, 29 Apr 2020 07:30:20 +0000 Message-ID: <20200429073020.83519-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 4981b82ba2ff ("mailbox: ZynqMP IPI mailbox controller") Signed-off-by: Wei Yongjun --- drivers/mailbox/zynqmp-ipi-mailbox.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c index 86887c9a349a..f9cc674ba9b7 100644 --- a/drivers/mailbox/zynqmp-ipi-mailbox.c +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c @@ -504,10 +504,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->req_buf_size = resource_size(&res); mchan->req_buf = devm_ioremap(mdev, res.start, mchan->req_buf_size); - if (IS_ERR(mchan->req_buf)) { + if (!mchan->req_buf) { dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); - ret = PTR_ERR(mchan->req_buf); - return ret; + return -ENOMEM; } } else if (ret != -ENODEV) { dev_err(mdev, "Unmatched resource %s, %d.\n", name, ret); @@ -520,10 +519,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->resp_buf_size = resource_size(&res); mchan->resp_buf = devm_ioremap(mdev, res.start, mchan->resp_buf_size); - if (IS_ERR(mchan->resp_buf)) { + if (!mchan->resp_buf) { dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); - ret = PTR_ERR(mchan->resp_buf); - return ret; + return -ENOMEM; } } else if (ret != -ENODEV) { dev_err(mdev, "Unmatched resource %s.\n", name); @@ -543,10 +541,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->req_buf_size = resource_size(&res); mchan->req_buf = devm_ioremap(mdev, res.start, mchan->req_buf_size); - if (IS_ERR(mchan->req_buf)) { + if (!mchan->req_buf) { dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); - ret = PTR_ERR(mchan->req_buf); - return ret; + return -ENOMEM; } } else if (ret != -ENODEV) { dev_err(mdev, "Unmatched resource %s.\n", name); @@ -559,10 +556,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->resp_buf_size = resource_size(&res); mchan->resp_buf = devm_ioremap(mdev, res.start, mchan->resp_buf_size); - if (IS_ERR(mchan->resp_buf)) { + if (!mchan->resp_buf) { dev_err(mdev, "Unable to map IPI buffer I/O memory\n"); - ret = PTR_ERR(mchan->resp_buf); - return ret; + return -ENOMEM; } } else if (ret != -ENODEV) { dev_err(mdev, "Unmatched resource %s.\n", name);