Commit 979857bb authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58af79f0

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

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void stmmac_default_data(void) 
 * 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.

 */

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)

{

	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

 * 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 stmmac_priv *priv = netdev_priv(ndev);
@@ -182,7 +182,7 @@ struct pci_driver stmmac_pci_driver = { 
	.name = STMMAC_RESOURCE_NAME,

	.id_table = stmmac_id_table,

	.probe = stmmac_pci_probe,

	.remove = __devexit_p(stmmac_pci_remove),

	.remove = stmmac_pci_remove,

#ifdef CONFIG_PM

	.suspend = stmmac_pci_suspend,

	.resume = stmmac_pci_resume,

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

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "stmmac.h"



#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,

					    const char **mac)

{
@@ -59,7 +59,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, 
	return 0;

}

#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,

					    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 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;

	struct resource *res;