openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

stmmac: remove __dev* attributes 

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:34 -05:00 committed by Greg Kroah-Hartman
parent 58af79f062
commit 979857bbcf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
View File

@ -61,7 +61,7 @@ static void stmmac_default_data(void)
* matches the device. The probe functions returns zero when the driver choose * matches the device. The probe functions returns zero when the driver choose
* to take "ownership" of the device or an error code(-ve no) otherwise. * to take "ownership" of the device or an error code(-ve no) otherwise.
*/ */
static int __devinit stmmac_pci_probe(struct pci_dev *pdev, static int stmmac_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int ret = 0; int ret = 0;
@ -130,7 +130,7 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev,
* Description: this function calls the main to free the net resources * Description: this function calls the main to free the net resources
* and releases the PCI resources. * and releases the PCI resources.
*/ */
static void __devexit stmmac_pci_remove(struct pci_dev *pdev) static void stmmac_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *ndev = pci_get_drvdata(pdev); struct net_device *ndev = pci_get_drvdata(pdev);
struct stmmac_priv *priv = netdev_priv(ndev); struct stmmac_priv *priv = netdev_priv(ndev);
@ -182,7 +182,7 @@ struct pci_driver stmmac_pci_driver = {
.name = STMMAC_RESOURCE_NAME, .name = STMMAC_RESOURCE_NAME,
.id_table = stmmac_id_table, .id_table = stmmac_id_table,
.probe = stmmac_pci_probe, .probe = stmmac_pci_probe,
.remove = __devexit_p(stmmac_pci_remove), .remove = stmmac_pci_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = stmmac_pci_suspend, .suspend = stmmac_pci_suspend,
.resume = stmmac_pci_resume, .resume = stmmac_pci_resume,

6
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@ -29,7 +29,7 @@
#include "stmmac.h" #include "stmmac.h"
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, static int stmmac_probe_config_dt(struct platform_device *pdev,
struct plat_stmmacenet_data *plat, struct plat_stmmacenet_data *plat,
const char **mac) const char **mac)
{ {
@ -59,7 +59,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev,
return 0; return 0;
} }
#else #else
static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, static int stmmac_probe_config_dt(struct platform_device *pdev,
struct plat_stmmacenet_data *plat, struct plat_stmmacenet_data *plat,
const char **mac) const char **mac)
{ {
@ -74,7 +74,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev,
* the necessary resources and invokes the main to init * the necessary resources and invokes the main to init
* the net device, register the mdio bus etc. * the net device, register the mdio bus etc.
*/ */
static int __devinit stmmac_pltfr_probe(struct platform_device *pdev) static int stmmac_pltfr_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
struct resource *res; struct resource *res;