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

Commit 85d89e61 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: move stmmac_pltfr_probe into dwmac-generic 



As all dwmac-* drivers now have their own probe function move
the common one into dwmac-generic driver and drop the EXPORT.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27ffefd2

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

+48 −1
Original line number Diff line number Diff line
@@ -16,6 +16,53 @@ 
#include "stmmac.h"

#include "stmmac_platform.h"



static int dwmac_generic_probe(struct platform_device *pdev)

{

	struct plat_stmmacenet_data *plat_dat;

	struct stmmac_resources stmmac_res;

	int ret;



	ret = stmmac_get_platform_resources(pdev, &stmmac_res);

	if (ret)

		return ret;



	if (pdev->dev.of_node) {

		plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);

		if (IS_ERR(plat_dat)) {

			dev_err(&pdev->dev, "dt configuration failed\n");

			return PTR_ERR(plat_dat);

		}

	} else {

		plat_dat = dev_get_platdata(&pdev->dev);

		if (!plat_dat) {

			dev_err(&pdev->dev, "no platform data provided\n");

			return  -EINVAL;

		}



		/* Set default value for multicast hash bins */

		plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;



		/* Set default value for unicast filter entries */

		plat_dat->unicast_filter_entries = 1;

	}



	/* Custom setup (if needed) */

	if (plat_dat->setup) {

		plat_dat->bsp_priv = plat_dat->setup(pdev);

		if (IS_ERR(plat_dat->bsp_priv))

			return PTR_ERR(plat_dat->bsp_priv);

	}



	/* Custom initialisation (if needed) */

	if (plat_dat->init) {

		ret = plat_dat->init(pdev, plat_dat->bsp_priv);

		if (ret)

			return ret;

	}



	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}



static const struct of_device_id dwmac_generic_match[] = {

	{ .compatible = "st,spear600-gmac"},

	{ .compatible = "snps,dwmac-3.610"},
@@ -27,7 +74,7 @@ static const struct of_device_id dwmac_generic_match[] = { 
MODULE_DEVICE_TABLE(of, dwmac_generic_match);



static struct platform_driver dwmac_generic_driver = {

	.probe  = stmmac_pltfr_probe,

	.probe  = dwmac_generic_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = STMMAC_RESOURCE_NAME,

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+0 −55
Original line number Diff line number Diff line
@@ -303,61 +303,6 @@ int stmmac_get_platform_resources(struct platform_device *pdev, 
}

EXPORT_SYMBOL_GPL(stmmac_get_platform_resources);



/**

 * stmmac_pltfr_probe - platform driver probe.

 * @pdev: platform device pointer

 * Description: platform_device probe function. It is to allocate

 * the necessary platform resources, invoke custom helper (if required) and

 * invoke the main probe function.

 */

int stmmac_pltfr_probe(struct platform_device *pdev)

{

	struct plat_stmmacenet_data *plat_dat;

	struct stmmac_resources stmmac_res;

	int ret;



	ret = stmmac_get_platform_resources(pdev, &stmmac_res);

	if (ret)

		return ret;



	if (pdev->dev.of_node) {

		plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);

		if (IS_ERR(plat_dat)) {

			dev_err(&pdev->dev, "dt configuration failed\n");

			return PTR_ERR(plat_dat);

		}

	} else {

		plat_dat = dev_get_platdata(&pdev->dev);

		if (!plat_dat) {

			dev_err(&pdev->dev, "no platform data provided\n");

			return  -EINVAL;

		}



		/* Set default value for multicast hash bins */

		plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;



		/* Set default value for unicast filter entries */

		plat_dat->unicast_filter_entries = 1;

	}



	/* Custom setup (if needed) */

	if (plat_dat->setup) {

		plat_dat->bsp_priv = plat_dat->setup(pdev);

		if (IS_ERR(plat_dat->bsp_priv))

			return PTR_ERR(plat_dat->bsp_priv);

	}



	/* Custom initialisation (if needed)*/

	if (plat_dat->init) {

		ret = plat_dat->init(pdev, plat_dat->bsp_priv);

		if (unlikely(ret))

			return ret;

	}



	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}

EXPORT_SYMBOL_GPL(stmmac_pltfr_probe);



/**

 * stmmac_pltfr_remove

 * @pdev: platform device pointer

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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac); 
int stmmac_get_platform_resources(struct platform_device *pdev,

				  struct stmmac_resources *stmmac_res);



int stmmac_pltfr_probe(struct platform_device *pdev);

int stmmac_pltfr_remove(struct platform_device *pdev);

extern const struct dev_pm_ops stmmac_pltfr_pm_ops;