aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-31 00:55:17 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-31 00:55:17 -0400
commit1f0f63885658889b3bcb8a08fbcb9532f8e536c9 (patch)
tree20de343cf23ff327a35d883bb61820553ffc6dd4 /drivers/net/stmmac
parent3ff2cfa55fb35bb5ea4490fbc82bb3c6771c121b (diff)
stmmac: Fix build warnings.
In file included from drivers/net/stmmac/stmmac_ethtool.c:30: drivers/net/stmmac/stmmac.h:111: warning: 'struct platform_device' declared inside parameter list drivers/net/stmmac/stmmac.h:111: warning: its scope is only this definition or declaration, which is probably not what you want drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe': drivers/net/stmmac/stmmac_main.c:1744: warning: cast from pointer to integer of different size In file included from drivers/net/stmmac/stmmac_mdio.c:31: drivers/net/stmmac/stmmac.h:111: warning: 'struct platform_device' declared inside parameter list drivers/net/stmmac/stmmac.h:111: warning: its scope is only this definition or declaration, which is probably not what you want drivers/net/stmmac/dwmac1000_core.c: In function 'dwmac1000_dump_regs': drivers/net/stmmac/dwmac1000_core.c:56: warning: cast from pointer to integer of different size Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac')
-rw-r--r--drivers/net/stmmac/dwmac1000_core.c2
-rw-r--r--drivers/net/stmmac/stmmac.h1
-rw-r--r--drivers/net/stmmac/stmmac_main.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index 8bbfc0f48dea..f1f426146f40 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -53,7 +53,7 @@ static void dwmac1000_core_init(void __iomem *ioaddr)
53static void dwmac1000_dump_regs(void __iomem *ioaddr) 53static void dwmac1000_dump_regs(void __iomem *ioaddr)
54{ 54{
55 int i; 55 int i;
56 pr_info("\tDWMAC1000 regs (base addr = 0x%8x)\n", (unsigned int)ioaddr); 56 pr_info("\tDWMAC1000 regs (base addr = 0x%p)\n", ioaddr);
57 57
58 for (i = 0; i < 55; i++) { 58 for (i = 0; i < 55; i++) {
59 int offset = i * 4; 59 int offset = i * 4;
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
index cca53dbac361..d0ddab0d21c2 100644
--- a/drivers/net/stmmac/stmmac.h
+++ b/drivers/net/stmmac/stmmac.h
@@ -21,6 +21,7 @@
21*******************************************************************************/ 21*******************************************************************************/
22 22
23#define DRV_MODULE_VERSION "Apr_2010" 23#define DRV_MODULE_VERSION "Apr_2010"
24#include <linux/platform_device.h>
24#include <linux/stmmac.h> 25#include <linux/stmmac.h>
25 26
26#include "common.h" 27#include "common.h"
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index c59c1061252a..e3f002eba89a 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1742,8 +1742,8 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
1742 priv->bsp_priv = plat_dat->bsp_priv; 1742 priv->bsp_priv = plat_dat->bsp_priv;
1743 1743
1744 pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n" 1744 pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n"
1745 "\tIO base addr: 0x%08x)\n", ndev->name, pdev->name, 1745 "\tIO base addr: 0x%p)\n", ndev->name, pdev->name,
1746 pdev->id, ndev->irq, (unsigned int)addr); 1746 pdev->id, ndev->irq, addr);
1747 1747
1748 /* MDIO bus Registration */ 1748 /* MDIO bus Registration */
1749 pr_debug("\tMDIO bus (id: %d)...", priv->bus_id); 1749 pr_debug("\tMDIO bus (id: %d)...", priv->bus_id);