mt76: fix compilation warning in mt76_eeprom_override()
authorLorenzo Bianconi <lorenzo@kernel.org>
Mon, 16 Dec 2019 18:32:10 +0000 (19:32 +0100)
committerFelix Fietkau <nbd@nbd.name>
Fri, 14 Feb 2020 09:06:02 +0000 (10:06 +0100)
Fix the following compilation warning in mt76_eeprom_override routine
when CONFIG_OF is not set and label 'out' is not actually used

drivers/net/wireless/mediatek/mt76/eeprom.c: In function ‘mt76_eeprom_override’:
drivers/net/wireless/mediatek/mt76/eeprom.c:100:1: warning: label ‘out’ defined but not used [-Wunused-label]

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/eeprom.c

index 8f26937..c236e30 100644 (file)
@@ -87,17 +87,14 @@ mt76_eeprom_override(struct mt76_dev *dev)
 {
 #ifdef CONFIG_OF
        struct device_node *np = dev->dev->of_node;
-       const u8 *mac;
+       const u8 *mac = NULL;
 
-       if (!np)
-               goto out;
-
-       mac = of_get_mac_address(np);
-       if (!IS_ERR(mac))
+       if (np)
+               mac = of_get_mac_address(np);
+       if (!IS_ERR_OR_NULL(mac))
                ether_addr_copy(dev->macaddr, mac);
 #endif
 
-out:
        if (!is_valid_ether_addr(dev->macaddr)) {
                eth_random_addr(dev->macaddr);
                dev_info(dev->dev,