KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oxnas: drop compatibility with old kernels from dwmac-oxnas

Browse source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-05-20 05:35:35 +02:00
parent c43635bc5c
commit 53a9809080
1 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/oxnas/files/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
View file

@ -25,7 +25,6 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/stmmac.h> #include <linux/stmmac.h>
#include <linux/version.h>
#include <mach/hardware.h> #include <mach/hardware.h>
@ -92,37 +91,21 @@ static void oxnas_gmac_exit(struct platform_device *pdev, void *priv)
} }
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
static void *oxnas_gmac_probe(struct platform_device *pdev)
{
#else
static int oxnas_gmac_probe(struct platform_device *pdev) static int oxnas_gmac_probe(struct platform_device *pdev)
{ {
struct plat_stmmacenet_data *plat_dat; struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res; struct stmmac_resources stmmac_res;
int ret; int ret;
#endif
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct oxnas_gmac *bsp_priv; struct oxnas_gmac *bsp_priv;
bsp_priv = devm_kzalloc(dev, sizeof(*bsp_priv), GFP_KERNEL); bsp_priv = devm_kzalloc(dev, sizeof(*bsp_priv), GFP_KERNEL);
if (!bsp_priv) if (!bsp_priv)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
return ERR_PTR(-ENOMEM);
#else
return -ENOMEM; return -ENOMEM;
#endif
bsp_priv->clk = devm_clk_get(dev, "gmac"); bsp_priv->clk = devm_clk_get(dev, "gmac");
if (IS_ERR(bsp_priv->clk)) if (IS_ERR(bsp_priv->clk))
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
return bsp_priv->clk;
#else
return PTR_ERR(bsp_priv->clk); return PTR_ERR(bsp_priv->clk);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
return bsp_priv;
#else
ret = stmmac_get_platform_resources(pdev, &stmmac_res); ret = stmmac_get_platform_resources(pdev, &stmmac_res);
if (ret) if (ret)
return ret; return ret;
@ -140,17 +123,8 @@ static int oxnas_gmac_probe(struct platform_device *pdev)
return ret; return ret;
return stmmac_dvr_probe(dev, plat_dat, &stmmac_res); return stmmac_dvr_probe(dev, plat_dat, &stmmac_res);
#endif
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
const struct stmmac_of_data oxnas_gmac_data = {
.has_gmac = 1,
.setup = oxnas_gmac_probe,
.init = oxnas_gmac_init,
.exit = oxnas_gmac_exit,
};
#else
static const struct of_device_id oxnas_gmac_match[] = { static const struct of_device_id oxnas_gmac_match[] = {
{ .compatible = "plxtech,nas782x-gmac" }, { .compatible = "plxtech,nas782x-gmac" },
{ } { }
@ -167,6 +141,5 @@ static struct platform_driver oxnas_gmac_driver = {
}, },
}; };
module_platform_driver(oxnas_gmac_driver); module_platform_driver(oxnas_gmac_driver);
#endif
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");