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

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

net/davinci_emac: 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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f73d12bd

drivers/net/ethernet/ti/davinci_emac.c

+3 −3
Original line number Diff line number Diff line
@@ -1850,7 +1850,7 @@ static struct emac_platform_data 
 * resource information from platform init and register a network device

 * and allocate resources necessary for driver to perform

 */

static int __devinit davinci_emac_probe(struct platform_device *pdev)

static int davinci_emac_probe(struct platform_device *pdev)

{

	int rc = 0;

	struct resource *res;
@@ -2039,7 +2039,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
 * Called when removing the device driver. We disable clock usage and release

 * the resources taken up by the driver and unregister network device

 */

static int __devexit davinci_emac_remove(struct platform_device *pdev)

static int davinci_emac_remove(struct platform_device *pdev)

{

	struct resource *res;

	struct net_device *ndev = platform_get_drvdata(pdev);
@@ -2107,7 +2107,7 @@ static struct platform_driver davinci_emac_driver = { 
		.of_match_table = of_match_ptr(davinci_emac_of_match),

	},

	.probe = davinci_emac_probe,

	.remove = __devexit_p(davinci_emac_remove),

	.remove = davinci_emac_remove,

};



/**

drivers/net/ethernet/ti/davinci_mdio.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data, 
}





static int __devinit davinci_mdio_probe(struct platform_device *pdev)

static int davinci_mdio_probe(struct platform_device *pdev)

{

	struct mdio_platform_data *pdata = pdev->dev.platform_data;

	struct device *dev = &pdev->dev;
@@ -416,7 +416,7 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit davinci_mdio_remove(struct platform_device *pdev)

static int davinci_mdio_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct davinci_mdio_data *data = dev_get_drvdata(dev);
@@ -496,7 +496,7 @@ static struct platform_driver davinci_mdio_driver = { 
		.of_match_table = of_match_ptr(davinci_mdio_of_mtable),

	},

	.probe = davinci_mdio_probe,

	.remove = __devexit_p(davinci_mdio_remove),

	.remove = davinci_mdio_remove,

};



static int __init davinci_mdio_init(void)