* [PATCH] net: mv643xx_eth: add missing semicolon
@ 2013-06-03 13:11 Arnd Bergmann
2013-06-04 6:35 ` Sebastian Hesselbarth
2013-06-05 0:19 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2013-06-03 13:11 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: David Miller, netdev
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 <arnd@arndb.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 23ea7b6..c7f9fb3 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: mv643xx_eth: add missing semicolon
2013-06-03 13:11 [PATCH] net: mv643xx_eth: add missing semicolon Arnd Bergmann
@ 2013-06-04 6:35 ` Sebastian Hesselbarth
2013-06-05 0:19 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sebastian Hesselbarth @ 2013-06-04 6:35 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: David Miller, netdev
On 06/03/2013 03:11 PM, Arnd Bergmann wrote:
> 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<arnd@arndb.de>
> Cc: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com>
Arnd,
thanks for cleaning the mess up and apologies for causing this
trouble.
Sebastian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: mv643xx_eth: add missing semicolon
2013-06-03 13:11 [PATCH] net: mv643xx_eth: add missing semicolon Arnd Bergmann
2013-06-04 6:35 ` Sebastian Hesselbarth
@ 2013-06-05 0:19 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-06-05 0:19 UTC (permalink / raw)
To: arnd; +Cc: sebastian.hesselbarth, netdev
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 03 Jun 2013 15:11:24 +0200
> 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 <arnd@arndb.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-05 0:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-03 13:11 [PATCH] net: mv643xx_eth: add missing semicolon Arnd Bergmann
2013-06-04 6:35 ` Sebastian Hesselbarth
2013-06-05 0:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).