From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938931AbcIXGbl (ORCPT ); Sat, 24 Sep 2016 02:31:41 -0400 Received: from mout.web.de ([212.227.17.11]:62266 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938657AbcIXGbj (ORCPT ); Sat, 24 Sep 2016 02:31:39 -0400 Subject: [PATCH 7/7] iio: Adjust checks for null pointers in six functions To: linux-iio@vger.kernel.org, Hartmut Knaack , Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <8e0c9fdd-fc9a-0093-278f-00f3beb2a8f6@users.sourceforge.net> Date: Sat, 24 Sep 2016 08:31:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:1a3TjLZCN5+mvjAOcuPqREhjtWbSbTiOkPBzzH9V5RjdSzfF5gm rw49PuHnMUZYeY40zt9hjH/zg5W8YriLshGrAgbiFln+rmfBnKNtd6Rs6nMZkBycguXMHOd YQOBt6yOV1BAQK5SNVF0zVKCPfhvDo3pg3/TkKHkXxrBqbcG6B9PWNMjoGkjKdRrJtOMKTh OOoV5GUbRn8qfJsRfaLkw== X-UI-Out-Filterresults: notjunk:1;V01:K0:kuHqq7e2uJY=:y7Gjc2edFOrMx1yVLVxiba UwOEB3coi9Zy8UFup3aODVnnjKTtxHpPXTQycBCpQTHIB5FIWKMvAy1a8GVJ0yEe6q4lkkKR1 D2o37n7E6/71VpNBmZHSi1sJAxLsLPWhheE9AVS+OlBPVIjcPxeMlBfFRerB8oTnJVrxv3MZ0 aJ0xHUr+33Zi1VGSsn9X1I/MzYUmIf4+WEDCMGzs7gvRwb8BRl5jlkRDzJhlkpoeGc84bqpmk DxBgbELbBbaeSdOTvHLs52gfUxj4U615s2E5ndspqO+m2ofBMONzcLsZjLw9jrzw15q6b/aUb go0v3IZhXsMk0gCxOXT3TYvYDQQ6phiRPpdvFRZduzhwResgifkneAnGFK21FOGojNw6xbnul 0QXx/ZxXtwXq8TtJlpmSzDCwfdlAGyskbOu3yKyjFCdLx4KK46iTNF/0nSFw9TSkCEFhffkbb vJdCYBVH26LHVR5Ntoj7mU8UqDplB94XCVuhenorP1EkAiViQdwFHMk761UU4dqojN92Rl91G V1/6dBBS+xXc0BSfmuOXDlDi+OxIyG1LD50f1rTUvff9QaOz/3hPn47+pKW1Ltc2SEYBNvWzA 32HeRkl4Xgnf6lMvuvG6qCvWgkhtua/H2Y+U/ots/A38s6DAEaB0AGlDf3SX5xsPOnoO5yWRP PuWXb1PkTMmD3fm44KQ8O35F3JiujTySxtjGSK07Fc+Ms+PAj3yPQxYxbfXrKaImaQbH6O1fB mah3m09ZlYEav3oRzwhXmENiGisb4SAllrKXeQM5TxrQEk7dozsgjbxGfAG5X98zwt5By8e/E OWYAFg9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 24 Sep 2016 08:00:07 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" can point information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/iio/industrialio-buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 57e201a..6893639 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -310,7 +310,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, trialmask = kmalloc_array(BITS_TO_LONGS(indio_dev->masklength), sizeof(*trialmask), GFP_KERNEL); - if (trialmask == NULL) + if (!trialmask) return -ENOMEM; if (!indio_dev->masklength) { WARN(1, "Trying to set scanmask prior to registering buffer\n"); @@ -711,7 +711,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, /* What scan mask do we actually have? */ compound_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength), sizeof(long), GFP_KERNEL); - if (compound_mask == NULL) + if (!compound_mask) return -ENOMEM; scan_timestamp = false; @@ -736,7 +736,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, compound_mask, strict_scanmask); kfree(compound_mask); - if (scan_mask == NULL) + if (!scan_mask) return -EINVAL; } else { scan_mask = compound_mask; @@ -940,7 +940,7 @@ int iio_update_buffers(struct iio_dev *indio_dev, goto out_unlock; } - if (indio_dev->info == NULL) { + if (!indio_dev->info) { ret = -ENODEV; goto out_unlock; } @@ -1130,11 +1130,11 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) indio_dev->scan_index_timestamp = channels[i].scan_index; } - if (indio_dev->masklength && buffer->scan_mask == NULL) { + if (indio_dev->masklength && !buffer->scan_mask) { buffer->scan_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength), sizeof(*buffer->scan_mask), GFP_KERNEL); - if (buffer->scan_mask == NULL) { + if (!buffer->scan_mask) { ret = -ENOMEM; goto error_cleanup_dynamic; } @@ -1146,7 +1146,7 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) buffer->scan_el_group.attrs = kcalloc(attrcount + 1, sizeof(buffer->scan_el_group.attrs[0]), GFP_KERNEL); - if (buffer->scan_el_group.attrs == NULL) { + if (!buffer->scan_el_group.attrs) { ret = -ENOMEM; goto error_free_scan_mask; } @@ -1291,7 +1291,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer, (*p)->length += length; } else { *p = kmalloc(sizeof(**p), GFP_KERNEL); - if (*p == NULL) + if (!*p) return -ENOMEM; (*p)->from = in_loc; (*p)->to = out_loc; @@ -1356,7 +1356,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, in_loc += length; } buffer->demux_bounce = kzalloc(out_loc, GFP_KERNEL); - if (buffer->demux_bounce == NULL) { + if (!buffer->demux_bounce) { ret = -ENOMEM; goto error_clear_mux_table; } -- 2.10.0