Skip to contentSkip to conversation

macb: fix build warning for !CONFIG_OF

PATCH Applied Arnd Bergmann 2 participants 2 messages Jul 8, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 macb: fix build warning for !CONFIG_OF

When CONFIG_OF is disabled, we get a harmless warning about the newly added variable:

drivers/net/ethernet/cadence/macb_main.c:48:39: error: 'mgmt' defined but not used [-Werror=unused-variable]
static struct sifive_fu540_macb_mgmt *mgmt;

Move the variable closer to its use inside of the #ifdef.

Fixes c218ad559020 ("macb: Add support for SiFive FU540-C000")
---
 drivers/net/ethernet/cadence/macb_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/macb_main.c +2 -2
index a27d32f69de9..5ca17e62dc3e 100644
@@ -45,8 +45,6 @@ struct sifive_fu540_macb_mgmt {
 	struct clk_hw hw;
 };
 
-static struct sifive_fu540_macb_mgmt *mgmt;
-
 #define MACB_RX_BUFFER_SIZE	128
 #define RX_BUFFER_MULTIPLE	64  /* bytes */
 
@@ -3628,6 +3626,8 @@ static int macb_init(struct platform_device *pdev)
 /* max number of receive buffers */
 #define AT91ETHER_MAX_RX_DESCR	9
 
+static struct sifive_fu540_macb_mgmt *mgmt;
+
 /* Initialize and start the Receiver and Transmit subsystems */
 static int at91ether_start(struct net_device *dev)
 {
Signature · 1 line
2.20.0
maintainer Applied
#1 lore raw

From: Arnd Bergmann <[email protected]>
Date: Mon, 8 Jul 2019 14:48:23 +0200

Quoted 10 lines

When CONFIG_OF is disabled, we get a harmless warning about the newly added variable:

drivers/net/ethernet/cadence/macb_main.c:48:39: error: 'mgmt' defined but not used [-Werror=unused-variable]
static struct sifive_fu540_macb_mgmt *mgmt;

Move the variable closer to its use inside of the #ifdef.

Fixes c218ad559020 ("macb: Add support for SiFive FU540-C000")

Applied, thanks Arnd.