From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754259AbdDQPOr (ORCPT ); Mon, 17 Apr 2017 11:14:47 -0400 Received: from mout.web.de ([217.72.192.78]:56859 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754119AbdDQPOo (ORCPT ); Mon, 17 Apr 2017 11:14:44 -0400 Subject: [PATCH 04/25] net: mvneta: Adjust six checks for null pointers From: SF Markus Elfring To: netdev@vger.kernel.org, "David S. Miller" , Florian Fainelli , Jarod Wilson , Jisheng Zhang , Mirko Lindner , Philippe Reynes , Russell King , Sergei Shtylyov , Stephen Hemminger , Thomas Petazzoni Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <6b0f9c85-0a3e-4f4f-9790-05436bb31d2d@users.sourceforge.net> Date: Mon, 17 Apr 2017 17:14:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:pOKfo3zon15IH/S3H2YnF3ZMSGa2EWczsiXojDLUi5lWIoV9L9D Iw9zbpFU6dsGtPMTkykuBbbqjVB+aKtDad16izd94olTCrDGeguYVImPRUiV4DD9Oqy2sf5 5JvxcqnNGWS92dU6UYFBgab0VzEXyQcMHEI8HRliLfSEHvaCAa1YZEw+jAWbGpgG6xNnWYA r42qZ9Uuruh4p56hOOJBA== X-UI-Out-Filterresults: notjunk:1;V01:K0:xMFuNZ9CggU=:PsmQLewlzE8PSTCKKiwX3f k1JI9nzDlRy+knagggHUo/EUqlrTJauL60OVRFYmlyL1GrhQi3xFdWFemk8ec95xBAi9Pl/b5 h0QACbV+CGZJvX+OOeiYCSGkVPK6s9n/gLnBuSfCtW7tqZI0SKc4UBdd8k2z0VoomXwaU3SkC zg2N99ESm5t3t+zxUqdRiBSns7FT9Bi0dGofljFyqGr3wE4iO17efI3R4BB/o4qEXFGb4eLbZ im42XyC+7UeDIFZO86CguYUc5K5uG0dwp4ZfAxfHKCyKg1mbTawmNx884mkmxGwnhwAqDol0J zH/Yxd7zDG+TMfEkCT7nw93l3yBYiKlolNS/iUyA6pHF1KmOXhIAb34cm14q9XhfDiL9j9rPF U+bTq2sHkJEvsR37YtCPop0mrY58m9vc4UCxFicp2oRweSmOcbr50kf/Hk8KUVuZGyWhIraRc N2HjnsE342nc+EVt+P4y8DmbiPmE1Y2xCWU8xBO9m+qQfeqOyGsGd1nbjTclS2CDszcDgHhzv BYvEaifqhg3P9eml8owLzfFRgv7HIgKJIFH4oTuVK5eSX5vNHMLEpeVYZ7zqYmAshWvuDuI8I /duOXcfpoczQJLV62XCuTc6GNKGPFjjss6dSbubhzrfvIq3ITouC2WxL7r6DCwgYUBtVwEszY fN+ahAJzwwqs8bNRjskc7gSITHywP46iXjSxnR7RoVlHRtbbB17mS6vAX472mlBwmwU/VFiBF xam9fUkxNrOAYBSyyqXwS9pIrNVdgW9eMqUwDzDwZEO+IGqLUPcMKpD43/KsSdIt4LxipG30t PdJXFsh Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 16 Apr 2017 22:45:33 +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/net/ethernet/marvell/mvneta.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 9c2ddd22a86f..6f436db8b01e 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1107,7 +1107,7 @@ static void mvneta_port_up(struct mvneta_port *pp) q_map = 0; for (queue = 0; queue < txq_number; queue++) { struct mvneta_tx_queue *txq = &pp->txqs[queue]; - if (txq->descs != NULL) + if (txq->descs) q_map |= (1 << queue); } mvreg_write(pp, MVNETA_TXQ_CMD, q_map); @@ -1116,7 +1116,7 @@ static void mvneta_port_up(struct mvneta_port *pp) for (queue = 0; queue < rxq_number; queue++) { struct mvneta_rx_queue *rxq = &pp->rxqs[queue]; - if (rxq->descs != NULL) + if (rxq->descs) q_map |= (1 << queue); } mvreg_write(pp, MVNETA_RXQ_CMD, q_map); @@ -2850,7 +2850,7 @@ static int mvneta_rxq_init(struct mvneta_port *pp, rxq->descs = dma_alloc_coherent(pp->dev->dev.parent, rxq->size * MVNETA_DESC_ALIGNED_SIZE, &rxq->descs_phys, GFP_KERNEL); - if (rxq->descs == NULL) + if (!rxq->descs) return -ENOMEM; rxq->last_desc = rxq->size - 1; @@ -2920,7 +2920,7 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->descs = dma_alloc_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, &txq->descs_phys, GFP_KERNEL); - if (txq->descs == NULL) + if (!txq->descs) return -ENOMEM; txq->last_desc = txq->size - 1; @@ -2935,7 +2935,7 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->tx_skb = kmalloc_array(txq->size, sizeof(*txq->tx_skb), GFP_KERNEL); - if (txq->tx_skb == NULL) { + if (!txq->tx_skb) { dma_free_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, txq->descs, txq->descs_phys); @@ -2946,7 +2946,7 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->tso_hdrs = dma_alloc_coherent(pp->dev->dev.parent, txq->size * TSO_HEADER_SIZE, &txq->tso_hdrs_phys, GFP_KERNEL); - if (txq->tso_hdrs == NULL) { + if (!txq->tso_hdrs) { kfree(txq->tx_skb); dma_free_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, -- 2.12.2