Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f0f6388 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ff2cfa5

drivers/net/stmmac/dwmac1000_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static void dwmac1000_core_init(void __iomem *ioaddr) 
static void dwmac1000_dump_regs(void __iomem *ioaddr)

static void dwmac1000_dump_regs(void __iomem *ioaddr)

{

{

	int i;

	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++) {

	for (i = 0; i < 55; i++) {

		int offset = i * 4;

		int offset = i * 4;

drivers/net/stmmac/stmmac.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
*******************************************************************************/

*******************************************************************************/





#define DRV_MODULE_VERSION	"Apr_2010"

#define DRV_MODULE_VERSION	"Apr_2010"

#include <linux/platform_device.h>

#include <linux/stmmac.h>

#include <linux/stmmac.h>





#include "common.h"

#include "common.h"

drivers/net/stmmac/stmmac_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1742,8 +1742,8 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
	priv->bsp_priv = plat_dat->bsp_priv;

	priv->bsp_priv = plat_dat->bsp_priv;





	pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n"

	pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n"

	       "\tIO base addr: 0x%08x)\n", ndev->name, pdev->name,

	       "\tIO base addr: 0x%p)\n", ndev->name, pdev->name,

	       pdev->id, ndev->irq, (unsigned int)addr);

	       pdev->id, ndev->irq, addr);





	/* MDIO bus Registration */

	/* MDIO bus Registration */

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

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