diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-06-03 03:11:24 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-04 17:18:58 -0700 |
| commit | ff20877ab3be42cf9c21a9b0173db690aa3165b0 (patch) | |
| tree | 35b8d2de051aa178fe3bb14278242d3740cf4069 /drivers/net/ethernet/marvell/mv643xx_eth.c | |
| parent | Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next (diff) | |
| download | linux-dev-ff20877ab3be42cf9c21a9b0173db690aa3165b0.tar.xz linux-dev-ff20877ab3be42cf9c21a9b0173db690aa3165b0.zip | |
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 <arnd@arndb.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 23ea7b6e23f1..c7f9fb33ce95 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) |