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

Commit f10f9fb2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

stmmac: platform: fix sparse warnings 



This patch fixes the following sparse warnings. One is fixed by casting return
value to a return type of the function. The others by creating a specific
stmmac_platform.h which provides the bits related to the platform driver.

drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c:59:29: warning: incorrect type in return expression (different address spaces)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c:59:29:    expected void *
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c:59:29:    got void [noderef] <asn:2>*reg

drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c:64:29: warning: symbol 'meson6_dwmac_data' was not declared. Should it be static?
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c:354:29: warning: symbol 'stih4xx_dwmac_data' was not declared. Should it be static?
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c:361:29: warning: symbol 'stid127_dwmac_data' was not declared. Should it be static?
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c:133:29: warning: symbol 'sun7i_gmac_data' was not declared. Should it be static?

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 424c4f78

drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/platform_device.h>

#include <linux/stmmac.h>



#include "stmmac_platform.h"



#define ETHMAC_SPEED_100	BIT(1)



struct meson_dwmac {
@@ -56,7 +58,7 @@ static void *meson6_dwmac_setup(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	dwmac->reg = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(dwmac->reg))

		return dwmac->reg;

		return ERR_CAST(dwmac->reg);



	return dwmac;

}

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
#include <linux/regmap.h>

#include <linux/reset.h>

#include <linux/stmmac.h>



#include "stmmac.h"

#include "stmmac_platform.h"



#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII 0x0

#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII 0x1

drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/of.h>

#include <linux/of_net.h>



#include "stmmac_platform.h"



#define DWMAC_125MHZ	125000000

#define DWMAC_50MHZ	50000000

#define DWMAC_25MHZ	25000000

drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/of_net.h>

#include <linux/regulator/consumer.h>



#include "stmmac_platform.h"



struct sunxi_priv_data {

	int interface;

	int clk_enabled;

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+0 −5
Original line number Diff line number Diff line
@@ -135,11 +135,6 @@ void stmmac_disable_eee_mode(struct stmmac_priv *priv); 
bool stmmac_eee_init(struct stmmac_priv *priv);



#ifdef CONFIG_STMMAC_PLATFORM

extern const struct stmmac_of_data meson6_dwmac_data;

extern const struct stmmac_of_data sun7i_gmac_data;

extern const struct stmmac_of_data stih4xx_dwmac_data;

extern const struct stmmac_of_data stid127_dwmac_data;

extern const struct stmmac_of_data socfpga_gmac_data;

extern struct platform_driver stmmac_pltfr_driver;



static inline int stmmac_register_platform(void)