Skip to content

Commit

Permalink
stmmac: Fix build warnings.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Aug 31, 2010
1 parent 3ff2cfa commit 1f0f638
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/stmmac/dwmac1000_core.c
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ static void dwmac1000_core_init(void __iomem *ioaddr)
static void dwmac1000_dump_regs(void __iomem *ioaddr)
{
int i;
pr_info("\tDWMAC1000 regs (base addr = 0x%8x)\n", (unsigned int)ioaddr);
pr_info("\tDWMAC1000 regs (base addr = 0x%p)\n", ioaddr);

for (i = 0; i < 55; i++) {
int offset = i * 4;
1 change: 1 addition & 0 deletions drivers/net/stmmac/stmmac.h
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
*******************************************************************************/

#define DRV_MODULE_VERSION "Apr_2010"
#include <linux/platform_device.h>
#include <linux/stmmac.h>

#include "common.h"
4 changes: 2 additions & 2 deletions drivers/net/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
@@ -1742,8 +1742,8 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
priv->bsp_priv = plat_dat->bsp_priv;

pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n"
"\tIO base addr: 0x%08x)\n", ndev->name, pdev->name,
pdev->id, ndev->irq, (unsigned int)addr);
"\tIO base addr: 0x%p)\n", ndev->name, pdev->name,
pdev->id, ndev->irq, addr);

/* MDIO bus Registration */
pr_debug("\tMDIO bus (id: %d)...", priv->bus_id);

0 comments on commit 1f0f638

Please sign in to comment.