From patchwork Sun Jan 21 20:30:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10177091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 11C5A601E7 for ; Sun, 21 Jan 2018 20:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F28F126224 for ; Sun, 21 Jan 2018 20:30:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E49E326E3C; Sun, 21 Jan 2018 20:30:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70C1426224 for ; Sun, 21 Jan 2018 20:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751021AbeAUUaZ (ORCPT ); Sun, 21 Jan 2018 15:30:25 -0500 Received: from mout.web.de ([217.72.192.78]:51440 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbeAUUaY (ORCPT ); Sun, 21 Jan 2018 15:30:24 -0500 Received: from [192.168.1.3] ([77.181.34.161]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LpfC6-1fGG2X2m3i-00fPBr; Sun, 21 Jan 2018 21:30:19 +0100 Subject: [PATCH 3/3] Input: cyttsp4_core: Adjust 13 checks for null pointers From: SF Markus Elfring To: linux-input@vger.kernel.org, Dmitry Torokhov , Ferruh Yigit Cc: LKML , kernel-janitors@vger.kernel.org References: <61183426-0b2a-4b93-933c-a2dfd487d92b@users.sourceforge.net> Message-ID: <6c4f8970-11bd-fe4c-1041-48a006b98b15@users.sourceforge.net> Date: Sun, 21 Jan 2018 21:30:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <61183426-0b2a-4b93-933c-a2dfd487d92b@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:aMQjsNxANL93JPQAjGG99OaUm8mo8fsowpKDVfFo+drTetTztzW uF75sdj/4VrEfh6iIX3Kj0hOTE6r3/1HLNeY7fVIoUr8m7uaefvdAe3I6t/xRo+q3VLndxw BWjOfnubTgRBE2edWJ62HdtlRmTUrzAGiQ9LLVFxnTYaD8oyySWdEWkChDLfvQD3iCtnLHF 6dbVN96DE+zkB/hwBNBgQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:LYmOyGHE7+I=:87rVMW+5c61coC2phQw7wX Ce/EmCqSWQiyoocPs1wG5/PAGxZ880bLxjwTpBjoFect94BiqcQYiBA92PYfF/9mm3nbcDCti tWM4dzfg7N+iCBDpPztN8hGTC1ZM7eGaOFk95LXNgxLt+4rOyi6fHZYNTAy90cM3mEsFfqwvf 60fFKCBlI/g/vWK1jpUctOoGuB+yY063a5+FE5V8KyXQ38HfQ8BZXOBtlDMJ5lravR6lm+lYw ZOI6jKeK+KrycePRpqTc68vehqz2jb5PvlPTr/RKV8fcMqUl9uOdcKueEF3UaiQFyTfM66Gqu sJam2WNZ+D2xiEkXXzzKyXRE9eOEdCOB47SpesqaVPCwvyzd3HIFR96tNjUth59K/i0VN/lhx nDwQSk+ZYue+XIU7Xdfel18uNMkfY9YWBznL/b11EC12y2tqbAK+NqsBK5Vxo9rS6JiF1XnkL aTieh4ZX3vndmtoGXko+A7Yw/QEJBUstfjqYDA40Gi/lhfYHXLlSQxgxSO5Qhz/zEsL0Dw8IY DFxucT3DhCWL9LCe0Re6IwCKb62WUJqA8Wr8nDEH/A4eBF2HmfYm5o8eoiEgU7AOR2kMF9QC7 dqoZA3kZexyk26UVkt9WutnvPpI6gggrV4dPljkRqIYYiElpprBKJE1qaB1FddHBP1/0z4FVG p8B/lPa7U0QOFooKEg0BEOvBRTf/BBRVC5byLHEitiJG04IeuHuvKkrKn5QORsjtsatcVwRC8 nfgJ57ogrtRQIOqPzmlZTtR7v5tcp8aspKj5aUOiFjJflnwrXOYSwxeeZrv0Wfj5xx1J17b6J GPzCmekpqjCUbvEPZa/tTP2ry5aW8iy6bMr59BTHKforMALmGk= Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 21 Jan 2018 21:15:11 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/input/touchscreen/cyttsp4_core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c index 35f48b66ff36..32a4a45554fe 100644 --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -213,7 +213,7 @@ static int cyttsp4_si_get_cydata(struct cyttsp4 *cd) si->si_ofs.cydata_size); p = krealloc(si->si_ptrs.cydata, si->si_ofs.cydata_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: failed to allocate cydata memory\n", __func__); return -ENOMEM; @@ -288,7 +288,7 @@ static int cyttsp4_si_get_test_data(struct cyttsp4 *cd) si->si_ofs.test_size = si->si_ofs.pcfg_ofs - si->si_ofs.test_ofs; p = krealloc(si->si_ptrs.test, si->si_ofs.test_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: failed to allocate test memory\n", __func__); return -ENOMEM; @@ -347,7 +347,7 @@ static int cyttsp4_si_get_pcfg_data(struct cyttsp4 *cd) si->si_ofs.pcfg_size = si->si_ofs.opcfg_ofs - si->si_ofs.pcfg_ofs; p = krealloc(si->si_ptrs.pcfg, si->si_ofs.pcfg_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: failed to allocate pcfg memory\n", __func__); return -ENOMEM; @@ -399,7 +399,7 @@ static int cyttsp4_si_get_opcfg_data(struct cyttsp4 *cd) si->si_ofs.opcfg_size = si->si_ofs.ddata_ofs - si->si_ofs.opcfg_ofs; p = krealloc(si->si_ptrs.opcfg, si->si_ofs.opcfg_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: failed to allocate opcfg memory\n", __func__); return -ENOMEM; @@ -488,7 +488,7 @@ static int cyttsp4_si_get_ddata(struct cyttsp4 *cd) si->si_ofs.ddata_size = si->si_ofs.mdata_ofs - si->si_ofs.ddata_ofs; p = krealloc(si->si_ptrs.ddata, si->si_ofs.ddata_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: fail alloc ddata memory\n", __func__); return -ENOMEM; } @@ -515,7 +515,7 @@ static int cyttsp4_si_get_mdata(struct cyttsp4 *cd) si->si_ofs.mdata_size = si->si_ofs.map_sz - si->si_ofs.mdata_ofs; p = krealloc(si->si_ptrs.mdata, si->si_ofs.mdata_size, GFP_KERNEL); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: fail alloc mdata memory\n", __func__); return -ENOMEM; } @@ -548,16 +548,16 @@ static int cyttsp4_si_get_btn_data(struct cyttsp4 *cd) p = krealloc(si->btn, si->si_ofs.btn_keys_size, GFP_KERNEL|__GFP_ZERO); - if (p == NULL) { + if (!p) { dev_err(cd->dev, "%s: %s\n", __func__, "fail alloc btn_keys memory"); return -ENOMEM; } si->btn = p; - if (cd->cpdata->sett[CY_IC_GRPNUM_BTN_KEYS] == NULL) + if (!cd->cpdata->sett[CY_IC_GRPNUM_BTN_KEYS]) num_defined_keys = 0; - else if (cd->cpdata->sett[CY_IC_GRPNUM_BTN_KEYS]->data == NULL) + else if (!cd->cpdata->sett[CY_IC_GRPNUM_BTN_KEYS]->data) num_defined_keys = 0; else num_defined_keys = cd->cpdata->sett @@ -592,19 +592,19 @@ static int cyttsp4_si_get_op_data_ptrs(struct cyttsp4 *cd) void *p; p = krealloc(si->xy_mode, si->si_ofs.mode_size, GFP_KERNEL|__GFP_ZERO); - if (p == NULL) + if (!p) return -ENOMEM; si->xy_mode = p; p = krealloc(si->xy_data, si->si_ofs.data_size, GFP_KERNEL|__GFP_ZERO); - if (p == NULL) + if (!p) return -ENOMEM; si->xy_data = p; p = krealloc(si->btn_rec_data, si->si_ofs.btn_rec_size * si->si_ofs.num_btns, GFP_KERNEL|__GFP_ZERO); - if (p == NULL) + if (!p) return -ENOMEM; si->btn_rec_data = p; @@ -1977,7 +1977,7 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd) dev_vdbg(dev, "%s: Create the input device and register it\n", __func__); md->input = input_allocate_device(); - if (md->input == NULL) { + if (!md->input) { dev_err(dev, "%s: Error, failed to allocate input device\n", __func__); rc = -ENOSYS;