Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934032AbdHYQFa (ORCPT ); Fri, 25 Aug 2017 12:05:30 -0400 Received: from mout.web.de ([212.227.15.3]:49311 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933744AbdHYQF2 (ORCPT ); Fri, 25 Aug 2017 12:05:28 -0400 Subject: [PATCH 08/14] vme: fake: Adjust 11 checks for null pointers From: SF Markus Elfring To: devel@driverdev.osuosl.org, Aaron Sierra , Alessio Igor Bogani , Arnd Bergmann , Augusto Mecking Caringi , Baoyou Xie , Greg Kroah-Hartman , Manohar Vanga , Martyn Welch Cc: LKML , kernel-janitors@vger.kernel.org References: <7ab4be89-4aa6-5537-9839-da090635f249@users.sourceforge.net> Message-ID: Date: Fri, 25 Aug 2017 18:05:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <7ab4be89-4aa6-5537-9839-da090635f249@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:+pS5C4CIlCAceWwFSMYdpV4LYDKvAQw4SVydEKIwqSXx1zJVgX+ 73xVncgghByborcmVM4824ZoOo/xx60m9A5lXvTHEdc0oUcGX+DAVDL+6NSwzS25kREtdhp BzN160MogZtVIwk7AZv7SyVzZ4E0Z2EJYypxt6K10lSYCyyD9YIt8jLri9+pmBBPRT7bWZy LWFvRCKwbxv04UqtkTJJw== X-UI-Out-Filterresults: notjunk:1;V01:K0:wgm8UBucPKo=:PkIdybU93ZIanE+3kiKuhw G6QdxDfo0Bcj1OBZzX7l/HwArPWi1UC2miRcK0Gx/VB7Xg3yhfumyFT24Odukn0Mxcr7nYfbq CPAf2FU9zSK+C3JS7tL9ATyuE0lH1nFwirZQjX+Ozm3mq5+Ssy5+Q5FTJ+LxFo03DnFEH5Zfs zNVPi3jAXaM/JFHs+rqf4/EKbGM/6RfMACt+L11wzUsO4TdN31wAbuAMsnsJvUFOl+fT+uksa qryDaRdmYza8dxkKTqszE1/RvweLpU7EA9BDWdWIvYv3C7wTyrx+Wr7fXA1PQWcGmjiKidtB7 XfFXBN8HRRAmMcoqWrn68XnraQE25DYm3V7ULbuX6yDaPlFFs5znxi7gSFO05HUCmOTovfZAY VBGwcva0ylhNLv0Tq474gRByOvzkAwMApd+mt8EDBlwTlzBsxrNOwPGY3/lvXb3YVsaORXp/P 4WUPAmUgIOiBx+D6MoSWUe9STYHWWN5GQcwcToBC2FKcQUBUuWcWDTKIhgl+uRk1/5ftOy46V gjhxzozK2AJ52d0Kkcn4E+lIInqq5w5KCkrG/j4guckuPNU30OZiQk2TXQZtAKDODI50RDsNB 3b5VC+Qb5UcbilddJhSCnjI+Ngz9k9dbksWdbmqTpafSRkHbP740ZZMmbTmORZ0kmeYECkGA2 hFb0VF/gmQLWigViwuQHOdYvc7lvUzvPdV6RM9XdTf+4IlKO94iHhezaJ/VrBaW4nzapr/G7H FSn8fUMSuWwkBe9pW0afKFbV+u2EsOPbGkaMYI6SvzmMMbBaWg0MQoNhRN7+XbU26B+7bCu48 AOSbJDWjxTRrk9YH8N4zA2mzwjORoTHLV2qZqmMJ7E70sb4/so= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4013 Lines: 120 From: Markus Elfring Date: Fri, 25 Aug 2017 10:01:16 +0200 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/vme/bridges/vme_fake.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/vme/bridges/vme_fake.c b/drivers/vme/bridges/vme_fake.c index 39f84df44557..7d83691047f4 100644 --- a/drivers/vme/bridges/vme_fake.c +++ b/drivers/vme/bridges/vme_fake.c @@ -409,7 +409,7 @@ static void fake_lm_check(struct fake_driver *bridge, unsigned long long addr, /* Each location monitor covers 8 bytes */ if (((lm_base + (8 * i)) <= addr) && ((lm_base + (8 * i) + 8) > addr)) { - if (bridge->lm_callback[i] != NULL) + if (bridge->lm_callback[i]) bridge->lm_callback[i]( bridge->lm_data[i]); } @@ -866,7 +866,7 @@ static int fake_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, /* If we already have a callback attached, we can't move it! */ for (i = 0; i < lm->monitors; i++) { - if (bridge->lm_callback[i] != NULL) { + if (bridge->lm_callback[i]) { mutex_unlock(&lm->mtx); pr_err("Location monitor callback attached, can't reset\n"); return -EBUSY; @@ -940,7 +940,7 @@ static int fake_lm_attach(struct vme_lm_resource *lm, int monitor, } /* Check that a callback isn't already attached */ - if (bridge->lm_callback[monitor] != NULL) { + if (bridge->lm_callback[monitor]) { mutex_unlock(&lm->mtx); pr_err("Existing callback attached\n"); return -EBUSY; @@ -978,7 +978,7 @@ static int fake_lm_detach(struct vme_lm_resource *lm, int monitor) /* If all location monitors disabled, disable global Location Monitor */ tmp = 0; for (i = 0; i < lm->monitors; i++) { - if (bridge->lm_callback[i] != NULL) + if (bridge->lm_callback[i]) tmp = 1; } @@ -1003,7 +1003,7 @@ static void *fake_alloc_consistent(struct device *parent, size_t size, { void *alloc = kmalloc(size, GFP_KERNEL); - if (alloc != NULL) + if (alloc) *dma = fake_ptr_to_pci(alloc); return alloc; @@ -1039,7 +1039,7 @@ static int fake_crcsr_init(struct vme_bridge *fake_bridge) /* Allocate mem for CR/CSR image */ bridge->crcsr_kernel = kzalloc(VME_CRCSR_BUF_SIZE, GFP_KERNEL); bridge->crcsr_bus = fake_ptr_to_pci(bridge->crcsr_kernel); - if (bridge->crcsr_kernel == NULL) + if (!bridge->crcsr_kernel) return -ENOMEM; vstat = fake_slot_get(fake_bridge); @@ -1076,13 +1076,13 @@ static int __init fake_init(void) * dynamically allocate this so we get one per device. */ fake_bridge = kzalloc(sizeof(*fake_bridge), GFP_KERNEL); - if (fake_bridge == NULL) { + if (!fake_bridge) { retval = -ENOMEM; goto err_struct; } fake_device = kzalloc(sizeof(*fake_device), GFP_KERNEL); - if (fake_device == NULL) { + if (!fake_device) { retval = -ENOMEM; goto err_driver; } @@ -1105,7 +1105,7 @@ static int __init fake_init(void) INIT_LIST_HEAD(&fake_bridge->master_resources); for (i = 0; i < FAKE_MAX_MASTER; i++) { master_image = kmalloc(sizeof(*master_image), GFP_KERNEL); - if (master_image == NULL) { + if (!master_image) { retval = -ENOMEM; goto err_master; } @@ -1131,7 +1131,7 @@ static int __init fake_init(void) INIT_LIST_HEAD(&fake_bridge->slave_resources); for (i = 0; i < FAKE_MAX_SLAVE; i++) { slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL); - if (slave_image == NULL) { + if (!slave_image) { retval = -ENOMEM; goto err_slave; } @@ -1153,7 +1153,7 @@ static int __init fake_init(void) /* Add location monitor to list */ INIT_LIST_HEAD(&fake_bridge->lm_resources); lm = kmalloc(sizeof(*lm), GFP_KERNEL); - if (lm == NULL) { + if (!lm) { retval = -ENOMEM; goto err_lm; } -- 2.14.0