Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934351AbdHYQRP (ORCPT ); Fri, 25 Aug 2017 12:17:15 -0400 Received: from mout.web.de ([212.227.15.14]:54586 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934093AbdHYQRN (ORCPT ); Fri, 25 Aug 2017 12:17:13 -0400 Subject: [PATCH 14/14] vme: tsi148: Adjust 14 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:17:07 +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:e1Wcyewmfpa87q3WhPZknlAaoMxaf6MPziak92ctZHuQGwTvp0s cj8qLkrky6K1Bm30E/pd0vF0AhaXxOpc4p2WQihgw53NrVg+ySkh0BaLtOQI0MO9SWxhzlo h01a2y+TvYCtJGRB3l4GNBg8HVIO2UKgrM6ZuBF0XgsLEjvDlb+AMxm/T28Lpi7p30iEN9l GeGyzlRh8EuXf9w/GZV6w== X-UI-Out-Filterresults: notjunk:1;V01:K0:xTstnpXC/pk=:hE53TIEyXhS5S46cFfJ+MS S64MpkrS/Mfsr9ov/F0keEd6mXQNWiax9gxJb2u6TOmnpa2umeSJvGYL3LC0X7jifSnmQhS/R z/y83xhgZie/5YrTdxUaMp7XUEsaxxmfoabQjXvqQvtEreLMqWDVfrAO+1bollYoM+J5Qw5s4 LuHGMcdufdFv2Yt7GGsiRCfYXZYTAze1sRD8G/6doog78jJvuzgywIE/ga852DJz1Q1QpVtmQ i5ojQ5wBenClicn+fp12b2EOGltNDx3vDrisY4LI9/OxaSsOVeSU6W1HKmS75tM98nTCPEhV1 aGKtJ4VkTHp1TFyQDl9U5oWkrCloxkJ/Hsc0WV79VsAE4xkHhwFvSD0w64Eab2hQSeImfWDBv KsXkeHmz7IECp7W8uBcwa+V5m3rbUkTPUib8zOcfHb+8kJXxopRFXn4hGJd/YIShFz0iY/fPc GrFJ9X4rcBniQWxXkodzruG/Z8GXpOKB7COIXdtZre4HL+XZ/SxSKN/BamrnUMOJNdaIF/usA T+i4BFoFwxe8Vy6a4zVAYfhDDefu/pVsfnbi79f95xZxSOw9K0Y1vayVCxVgAagsrhPdVxp0A +JcFiNVVoZ+rGIjhlmlq4/q9Jv6kvUO2vSzwUemQ6Z1yY5utseILU5jQ3ODO6q8kX9TiZP6cY bu1O5jooZq8VLH6o4SS+AAmx3oDr/saWt4GvrjJJZHD6di+nskE01lmo0Zz0jfh1u2R8j9XIy 6gNLWV5k/a3cvMtGnBqI61wm5C9h2Zls7U1G7zjSjJoU82DJ5kLL6IEVsSRzZ98Q0//3yMrzn kaub1iV8fGXbSwgP4da2MV4vpViR5gYZn5jJxIPqXTZsLpiAqs= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4987 Lines: 142 From: Markus Elfring Date: Fri, 25 Aug 2017 12:00:17 +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_tsi148.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index 61946f5d356f..cba9514605b7 100644 --- a/drivers/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c @@ -748,9 +748,9 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, if (size == 0) return 0; - if (image->bus_resource.name == NULL) { + if (!image->bus_resource.name) { image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC); - if (image->bus_resource.name == NULL) { + if (!image->bus_resource.name) { retval = -ENOMEM; goto err_name; } @@ -776,7 +776,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, image->kern_base = ioremap_nocache( image->bus_resource.start, size); - if (image->kern_base == NULL) { + if (!image->kern_base) { dev_err(tsi148_bridge->parent, "Failed to remap resource\n"); retval = -ENOMEM; goto err_remap; @@ -1640,7 +1640,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, /* Descriptor must be aligned on 64-bit boundaries */ entry = kmalloc(sizeof(*entry), GFP_KERNEL); - if (entry == NULL) { + if (!entry) { retval = -ENOMEM; goto err_mem; } @@ -1943,7 +1943,7 @@ static int tsi148_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); dev_err(tsi148_bridge->parent, "Location monitor " "callback attached, can't reset\n"); @@ -2068,7 +2068,7 @@ static int tsi148_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); dev_err(tsi148_bridge->parent, "Existing callback attached\n"); return -EBUSY; @@ -2205,7 +2205,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge, /* Allocate mem for CR/CSR image */ bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE, &bridge->crcsr_bus); - if (bridge->crcsr_kernel == NULL) { + if (!bridge->crcsr_kernel) { dev_err(tsi148_bridge->parent, "Failed to allocate memory for " "CR/CSR image\n"); return -ENOMEM; @@ -2292,14 +2292,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) * dynamically generate this so we get one per device */ tsi148_bridge = kzalloc(sizeof(*tsi148_bridge), GFP_KERNEL); - if (tsi148_bridge == NULL) { + if (!tsi148_bridge) { retval = -ENOMEM; goto err_struct; } vme_init_bridge(tsi148_bridge); tsi148_device = kzalloc(sizeof(*tsi148_device), GFP_KERNEL); - if (tsi148_device == NULL) { + if (!tsi148_device) { retval = -ENOMEM; goto err_driver; } @@ -2365,7 +2365,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) tsi148_device->flush_image = kmalloc(sizeof(*tsi148_device->flush_image), GFP_KERNEL); - if (tsi148_device->flush_image == NULL) { + if (!tsi148_device->flush_image) { retval = -ENOMEM; goto err_master; } @@ -2381,7 +2381,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* Add master windows to list */ for (i = 0; i < master_num; i++) { master_image = kmalloc(sizeof(*master_image), GFP_KERNEL); - if (master_image == NULL) { + if (!master_image) { retval = -ENOMEM; goto err_master; } @@ -2407,7 +2407,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* Add slave windows to list */ for (i = 0; i < TSI148_MAX_SLAVE; i++) { slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL); - if (slave_image == NULL) { + if (!slave_image) { retval = -ENOMEM; goto err_slave; } @@ -2428,7 +2428,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* Add dma engines to list */ for (i = 0; i < TSI148_MAX_DMA; i++) { dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL); - if (dma_ctrlr == NULL) { + if (!dma_ctrlr) { retval = -ENOMEM; goto err_dma; } @@ -2448,7 +2448,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* Add location monitor to list */ lm = kmalloc(sizeof(*lm), GFP_KERNEL); - if (lm == NULL) { + if (!lm) { retval = -ENOMEM; goto err_lm; } -- 2.14.0