| Message ID | 20190708124840.3616530-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 49db9228b8d83cbdef44b4757a393990f48b6d85 |
| Headers | show |
| Series | [net-next] macb: fix build warning for !CONFIG_OF | expand |
From: Arnd Bergmann <arnd@arndb.de> Date: Mon, 8 Jul 2019 14:48:23 +0200 > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks Arnd.
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index a27d32f69de9..5ca17e62dc3e 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -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) {
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") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/cadence/macb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.0