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

Commit 50649ab1 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: drop driver from stmmac platform code 



The dwmac-generic replaces the driver inside the stmmac
platform code. This turns stmmac platform into a library
used by drivers for common platform driver functions.

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

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

+3 −1
Original line number Diff line number Diff line 
/*

 * Generic DWMAC platform driver

 *

 * Copyright (C) 2007-2011  STMicroelectronics Ltd

 * Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public
@@ -12,6 +13,7 @@ 
#include <linux/of.h>

#include <linux/platform_device.h>



#include "stmmac.h"

#include "stmmac_platform.h"



static const struct of_device_id dwmac_generic_match[] = {
@@ -28,7 +30,7 @@ static struct platform_driver dwmac_generic_driver = { 
	.probe  = stmmac_pltfr_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = "dwmac-generic",

		.name           = STMMAC_RESOURCE_NAME,

		.pm		= &stmmac_pltfr_pm_ops,

		.of_match_table = of_match_ptr(dwmac_generic_match),

	},

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

+0 −22
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
#include "stmmac.h"

#include "stmmac_platform.h"



static const struct of_device_id stmmac_dt_ids[] = {

	/* SoC specific glue layers should come before generic bindings */

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, stmmac_dt_ids);



#ifdef CONFIG_OF



/**
@@ -431,19 +425,3 @@ static int stmmac_pltfr_resume(struct device *dev) 
SIMPLE_DEV_PM_OPS(stmmac_pltfr_pm_ops, stmmac_pltfr_suspend,

				       stmmac_pltfr_resume);

EXPORT_SYMBOL_GPL(stmmac_pltfr_pm_ops);
 


static struct platform_driver stmmac_pltfr_driver = {

	.probe = stmmac_pltfr_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		   .name = STMMAC_RESOURCE_NAME,

		   .pm = &stmmac_pltfr_pm_ops,

		   .of_match_table = of_match_ptr(stmmac_dt_ids),

	},

};



module_platform_driver(stmmac_pltfr_driver);



MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PLATFORM driver");

MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");

MODULE_LICENSE("GPL");