Skip to contentSkip to conversation

net: ena: use NULL instead of zero

PATCH In review Wang Hai 3 participants 4 messages Jul 18, 2020 – Jul 20, 2020

Subsystems (3)
lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH 1/1 net: ena: use NULL instead of zero

Fix sparse build warning:

drivers/net/ethernet/amazon/ena/ena_netdev.c:2193:34: warning:
Using plain integer as NULL pointer

---
 drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
index 91be3ffa1c5c..11303a4b94be 100644
@@ -2190,7 +2190,7 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter,
 static void ena_init_napi_in_range(struct ena_adapter *adapter,
 				   int first_index, int count)
 {
-	struct ena_napi *napi = {0};
+	struct ena_napi *napi = NULL;
 	int i;
 
 	for (i = first_index; i < first_index + count; i++) {
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Wang Hai

Fix sparse build warning:

drivers/net/ethernet/amazon/ena/ena_netdev.c:2193:34: warning:
Using plain integer as NULL pointer

Better to remove the initialization altogether and move the declaration into the loop.

drivers/net/ethernet/amazon/ena/ena_netdev.c

Quoted 1 line
drivers/net/ethernet/amazon/ena/ena_netdev.c +0 -0

[]

drivers/net/ethernet/amazon/ena/ena_netdev.c static void ena_del_napi_in_range(struct ena_adapter *adapter, · line 2196

Quoted 9 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -2190,7 +2190,7 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter,
 static void ena_init_napi_in_range(struct ena_adapter *adapter,
 				   int first_index, int count)
 {
-	struct ena_napi *napi = {0};
+	struct ena_napi *napi = NULL;
 	int i;
 
 	for (i = first_index; i < first_index + count; i++) {
---
 drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -2
index 91be3ffa1c5c..470d8f38b824 100644
@@ -2190,11 +2190,10 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter,
 static void ena_init_napi_in_range(struct ena_adapter *adapter,
 				   int first_index, int count)
 {
-	struct ena_napi *napi = {0};
 	int i;
 
 	for (i = first_index; i < first_index + count; i++) {
-		napi = &adapter->ena_napi[i];
+		struct ena_napi *napi = &adapter->ena_napi[i];
 
 		netif_napi_add(adapter->netdev,
 			       &adapter->ena_napi[i].napi,
Acked-by
#2 lore raw
Quoted 44 lines · Joe Perches
Quoted 4 lines · Wang Hai

Fix sparse build warning:

drivers/net/ethernet/amazon/ena/ena_netdev.c:2193:34: warning:
Using plain integer as NULL pointer

Better to remove the initialization altogether and move the declaration into the loop.

drivers/net/ethernet/amazon/ena/ena_netdev.c

Quoted 1 line
drivers/net/ethernet/amazon/ena/ena_netdev.c +0 -0

[]

Quoted 11 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -2190,7 +2190,7 @@ static void ena_del_napi_in_range(struct 
 ena_adapter *adapter,
 static void ena_init_napi_in_range(struct ena_adapter 
 *adapter,
 				   int first_index, int count)
 {
-	struct ena_napi *napi = {0};
+	struct ena_napi *napi = NULL;
 	int i;

for (i = first_index; i < first_index + count; i++) {

---
 drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -2
index 91be3ffa1c5c..470d8f38b824 100644
@@ -2190,11 +2190,10 @@ static void ena_del_napi_in_range(struct 
 ena_adapter *adapter,
 static void ena_init_napi_in_range(struct ena_adapter *adapter,
 				   int first_index, int count)
 {
-	struct ena_napi *napi = {0};
 	int i;
 
 	for (i = first_index; i < first_index + count; i++) {
-		napi = &adapter->ena_napi[i];
+		struct ena_napi *napi = &adapter->ena_napi[i];
 
 		netif_napi_add(adapter->netdev,
Quoted 1 line

&adapter->ena_napi[i].napi,

We prefer the second variant as it improves code readability imo. Thank you both for the time you invested in it (:

#3 lore raw
In reply to Joe Perches
Quoted 7 lines · Joe Perches
Quoted 4 lines · Wang Hai

Fix sparse build warning:

drivers/net/ethernet/amazon/ena/ena_netdev.c:2193:34: warning:
Using plain integer as NULL pointer

Better to remove the initialization altogether and move the declaration into the loop.

Thanks for your advice. I'll send a v2 patch.