From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754423AbdEJSDx (ORCPT ); Wed, 10 May 2017 14:03:53 -0400 Received: from mout.web.de ([212.227.15.4]:57294 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932217AbdEJSDO (ORCPT ); Wed, 10 May 2017 14:03:14 -0400 Subject: [PATCH 3/3] s390/dasd: Adjust six checks for null pointers From: SF Markus Elfring To: linux-s390@vger.kernel.org, Heiko Carstens , =?UTF-8?Q?Jan_H=c3=b6ppner?= , Martin Schwidefsky , Stefan Haberland Cc: LKML , kernel-janitors@vger.kernel.org References: <4af00744-1c8a-6b33-22c8-d26d569f6c5f@users.sourceforge.net> Message-ID: <1395faca-9953-5873-0892-3d2eedbef2b6@users.sourceforge.net> Date: Wed, 10 May 2017 20:03:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: <4af00744-1c8a-6b33-22c8-d26d569f6c5f@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:jqRqFzXhvkjMPTohUz/RkNO/4Cuaw97NLSR6WPTSK0js5COYcBC 01m1kI3CHunruo/ljc2lUsFgW+e7fMudUIqOVY57PFon2EFCrRs1/A3sk3lymBqMmJCX9UU QWRapelWDVD0WV+RIgGoZr9oESpAN+s6uPiNJ84JThey6PavgUAPiHy2P/3gM3QKIusdFcd XJs9QLyp41EzDB6xtuJ9w== X-UI-Out-Filterresults: notjunk:1;V01:K0:RboNRrCx2v8=:7s5PlM8hP2RHK+/ZkSC58s 8kLyWIOb4D+WkWdAyEsu4onn+vQ4V+SxvjgPQ80DB6xlle6HSfCMmYFiuhaT5ZOPj5f+zJr0L yuVQu/LsrxmoYOWzqIGfeA+tciCT5CIVwszdAI/jondBGrFyiKETGr/rg6avbsG5xRhqCBanD SdT5avoeo9+xtq2q3EWVpsY4N5sYcUj1X/KB5yNsRAejEN2dE7gUcD7tU6mB7Ig49pWIHsMVM awE9UiBToX6DWVCJd1Se8bQgYs89m5AeOMq9mMCsCV7BkgnmPJ6+rVjfZ/+SAhJMUDPFB8k8l KLiSxn9jrrWmqr5PI1rlsNlMlBHhQQ9vywkOxplh2VVDyoopr1zfV2fCRoEAYPffAmr3glWYy nvUIle969DuThEmdmZjovAt2/AA3gFq8Gwg7pDUClSe2WTjns5611FUtxQxtsICvo7jxvPOMh qlbUSMeBsrMVN4QBQm0DSWmaavauAXjmCIzD+Gq7F7RPGtnE5Zbb2QJkPpDJt+rezg/UccpKL z5y3vunqgb+vR7YSb+NU97o50dBcjP0dri/rud/fjf6O1zbeLrf6PtTYBeQTZF6XY9XO2rg6M 7pYmDpqRksNessknI9prVPpe/BP/O/vZrxa2pOs3aZncUt+0SFs2eg2gizIhFQcjcTjgyS5Sh /zwfr6vDQHzZYAsNCxGYYt4aLIDjZi90hc440n/Dt/WfvnxuWpQVtaF2h8+e3yirU/ZicL6yB 01NaGcjedxGGRpNi6sPP1j/btPFk9GT8E4P/WXzeXljLCYvW62z8G/cNEKicgphBJniqjY548 Gt8YBAf Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 10 May 2017 19:29: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/s390/block/dasd_eckd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index e78601d97a67..d02f3bbbd552 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -1080,7 +1080,7 @@ static int dasd_eckd_read_conf(struct dasd_device *device) "error %d", rc); return rc; } - if (conf_data == NULL) { + if (!conf_data) { DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s", "No configuration data " "retrieved"); @@ -2049,7 +2049,7 @@ static int dasd_eckd_end_analysis(struct dasd_block *block) "Track 0 has no records following the VTOC\n"); } - if (count_area != NULL && count_area->kl == 0) { + if (count_area && count_area->kl == 0) { /* we found notthing violating our disk layout */ if (dasd_check_blocksize(count_area->dl) == 0) block->bp_block = count_area->dl; @@ -2649,10 +2649,10 @@ static int dasd_eckd_format_process_data(struct dasd_device *base, old_start = fdata->start_unit; old_stop = fdata->stop_unit; - if (!tpm && fmt_buffer != NULL) { + if (!tpm && fmt_buffer) { /* Command Mode / Format Check */ format_step = 1; - } else if (tpm && fmt_buffer != NULL) { + } else if (tpm && fmt_buffer) { /* Transport Mode / Format Check */ format_step = DASD_CQR_MAX_CCW / rpt; } else { @@ -4681,7 +4681,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device, int len, sl, sct; page = (char *) get_zeroed_page(GFP_ATOMIC); - if (page == NULL) { + if (!page) { DBF_DEV_EVENT(DBF_WARNING, device, "%s", "No memory to dump sense data\n"); return; @@ -4785,7 +4785,7 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device, u8 *sense, *rcq; page = (char *) get_zeroed_page(GFP_ATOMIC); - if (page == NULL) { + if (!page) { DBF_DEV_EVENT(DBF_WARNING, device, " %s", "No memory to dump sense data"); return; -- 2.12.3