linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Jarod Wilson <jarod@redhat.com>,
	Jisheng Zhang <jszhang@marvell.com>,
	Mirko Lindner <mlindner@marvell.com>,
	Philippe Reynes <tremyfr@gmail.com>,
	Russell King <rmk+kernel@armlinux.org.uk>,
	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	Stephen Hemminger <stephen@networkplumber.org>,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 04/25] net: mvneta: Adjust six checks for null pointers
Date: Mon, 17 Apr 2017 17:14:25 +0200	[thread overview]
Message-ID: <6b0f9c85-0a3e-4f4f-9790-05436bb31d2d@users.sourceforge.net> (raw)
In-Reply-To: <d6f26bba-c678-5b66-4f5d-85f56d895190@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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

  parent reply	other threads:[~2017-04-17 15:14 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-17 15:03 [PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations SF Markus Elfring
2017-04-17 15:08 ` [PATCH 01/25] net: mvneta: Use devm_kmalloc_array() in mvneta_init() SF Markus Elfring
2017-04-17 15:10 ` [PATCH 02/25] net: mvneta: Improve two size determinations " SF Markus Elfring
2017-04-17 15:13 ` [PATCH 03/25] net: mvneta: Use kmalloc_array() in mvneta_txq_init() SF Markus Elfring
2017-04-17 15:14 ` SF Markus Elfring [this message]
2017-04-17 15:15 ` [PATCH 05/25] net: mvpp2: Use kmalloc_array() in mvpp2_txq_init() SF Markus Elfring
2017-04-17 15:16 ` [PATCH 06/25] net: mvpp2: Improve two size determinations in mvpp2_probe() SF Markus Elfring
2017-04-17 15:17 ` [PATCH 07/25] net: mvpp2: Improve another size determination in mvpp2_init() SF Markus Elfring
2017-04-17 15:18 ` [PATCH 08/25] net: mvpp2: Improve another size determination in mvpp2_port_probe() SF Markus Elfring
2017-04-17 15:19 ` [PATCH 09/25] net: mvpp2: Improve another size determination in mvpp2_bm_init() SF Markus Elfring
2017-04-17 15:20 ` [PATCH 10/25] net: mvpp2: Improve another size determination in mvpp2_prs_default_init() SF Markus Elfring
2017-04-17 15:21 ` [PATCH 11/25] net: mvpp2: Improve 27 size determinations SF Markus Elfring
2017-04-17 15:22 ` [PATCH 12/25] net: mvpp2: Improve a size determination in two functions SF Markus Elfring
2017-04-17 15:23 ` [PATCH 13/25] net: mvpp2: Fix a jump label position in mvpp2_rx() SF Markus Elfring
2017-04-17 15:24 ` [PATCH 14/25] net: mvpp2: Rename a jump label in two functions SF Markus Elfring
2017-04-17 15:25 ` [PATCH 15/25] net: mvpp2: Adjust three error messages SF Markus Elfring
2017-04-17 15:26 ` [PATCH 16/25] net: mvpp2: Rename a jump label in mvpp2_tx_frag_process() SF Markus Elfring
2017-04-17 15:27 ` [PATCH 17/25] net: mvpp2: Rename a jump label in mvpp2_txq_init() SF Markus Elfring
2017-04-17 15:28 ` [PATCH 18/25] net: mvpp2: Rename a jump label in mvpp2_prs_double_vlan_add() SF Markus Elfring
2017-04-17 15:29 ` [PATCH 19/25] net: mvpp2: Rename a jump label in mvpp2_prs_vlan_add() SF Markus Elfring
2017-04-17 15:30 ` [PATCH 20/25] net: mvpp2: Adjust a null pointer check in mvpp2_egress_enable() SF Markus Elfring
2017-04-17 15:31 ` [PATCH 21/25] net: pxa168_eth: Use kcalloc() in two functions SF Markus Elfring
2017-04-17 15:32 ` [PATCH 22/25] net: pxa168_eth: Adjust four checks for null pointers SF Markus Elfring
2017-04-17 15:33 ` [PATCH 23/25] skge: Use seq_puts() in skge_debug_show() SF Markus Elfring
2017-04-17 15:34 ` [PATCH 24/25] skge: Adjust a null pointer check in skge_down() SF Markus Elfring
2017-04-17 15:35 ` [PATCH 25/25] sky2: Use seq_puts() in sky2_debug_show() SF Markus Elfring
2017-04-18 18:09 ` [PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6b0f9c85-0a3e-4f4f-9790-05436bb31d2d@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=jarod@redhat.com \
    --cc=jszhang@marvell.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mlindner@marvell.com \
    --cc=netdev@vger.kernel.org \
    --cc=rmk+kernel@armlinux.org.uk \
    --cc=sergei.shtylyov@cogentembedded.com \
    --cc=stephen@networkplumber.org \
    --cc=thomas.petazzoni@free-electrons.com \
    --cc=tremyfr@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).