Skip to contentSkip to conversation

net: mv643xx_eth: add missing semicolon

PATCH Applied Arnd Bergmann 3 participants 3 messages Jun 3, 2013 – Jun 5, 2013

Subsystems (3)
Networking Network drivers Marvell MV643XX Ethernet driver
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 net: mv643xx_eth: add missing semicolon

76723bca28 "net: mv643xx_eth: add DT parsing support" added a dummy mv643xx_eth_shared_of_probe() fallback function with a typo.

This adds the missing semicolon so we can build without CONFIG_OF again, and changes both dummy functions to the more conventional "static inline" syntax, which can avoid potential problems with the empty macro.

Signed-off-by Arnd Bergmann <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
drivers/net/ethernet/marvell/mv643xx_eth.c +5 -3
index 23ea7b6..c7f9fb3 100644
@@ -2582,12 +2582,14 @@ static void mv643xx_eth_shared_of_remove(void)
 	}
 }
 #else
-static int mv643xx_eth_shared_of_probe(struct platform_device *pdev)
+static inline int mv643xx_eth_shared_of_probe(struct platform_device *pdev)
 {
-	return 0
+	return 0;
 }
 
-#define mv643xx_eth_shared_of_remove()
+static inline void mv643xx_eth_shared_of_remove(void)
+{
+}
 #endif
 
 static int mv643xx_eth_shared_probe(struct platform_device *pdev)
maintainer
#1 lore raw
Quoted 11 lines · Arnd Bergmann

76723bca28 "net: mv643xx_eth: add DT parsing support" added a dummy mv643xx_eth_shared_of_probe() fallback function with a typo.

This adds the missing semicolon so we can build without CONFIG_OF again, and changes both dummy functions to the more conventional "static inline" syntax, which can avoid potential problems with the empty macro.

Signed-off-by Arnd Bergmann<[email protected]>
Cc Sebastian Hesselbarth<[email protected]>

Arnd,

thanks for cleaning the mess up and apologies for causing this trouble.

Sebastian

maintainer Applied
#2 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>
Date: Mon, 03 Jun 2013 15:11:24 +0200

Quoted 10 lines

76723bca28 "net: mv643xx_eth: add DT parsing support" added a dummy mv643xx_eth_shared_of_probe() fallback function with a typo.

This adds the missing semicolon so we can build without CONFIG_OF again, and changes both dummy functions to the more conventional "static inline" syntax, which can avoid potential problems with the empty macro.

Signed-off-by Arnd Bergmann <[email protected]>

Applied, thanks.