forked from Minki/linux
smc911x: 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8489ec1f97
commit
9f1e13db59
@ -1712,7 +1712,7 @@ static const struct ethtool_ops smc911x_ethtool_ops = {
|
||||
* This routine has a simple purpose -- make the SMC chip generate an
|
||||
* interrupt, so an auto-detect routine can detect it, and find the IRQ,
|
||||
*/
|
||||
static int __devinit smc911x_findirq(struct net_device *dev)
|
||||
static int smc911x_findirq(struct net_device *dev)
|
||||
{
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
int timeout = 20;
|
||||
@ -1790,7 +1790,7 @@ static const struct net_device_ops smc911x_netdev_ops = {
|
||||
* o actually GRAB the irq.
|
||||
* o GRAB the region
|
||||
*/
|
||||
static int __devinit smc911x_probe(struct net_device *dev)
|
||||
static int smc911x_probe(struct net_device *dev)
|
||||
{
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
int i, retval;
|
||||
@ -2030,7 +2030,7 @@ err_out:
|
||||
* 0 --> there is a device
|
||||
* anything else, error
|
||||
*/
|
||||
static int __devinit smc911x_drv_probe(struct platform_device *pdev)
|
||||
static int smc911x_drv_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *ndev;
|
||||
struct resource *res;
|
||||
@ -2105,7 +2105,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit smc911x_drv_remove(struct platform_device *pdev)
|
||||
static int smc911x_drv_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||
struct smc911x_local *lp = netdev_priv(ndev);
|
||||
@ -2176,7 +2176,7 @@ static int smc911x_drv_resume(struct platform_device *dev)
|
||||
|
||||
static struct platform_driver smc911x_driver = {
|
||||
.probe = smc911x_drv_probe,
|
||||
.remove = __devexit_p(smc911x_drv_remove),
|
||||
.remove = smc911x_drv_remove,
|
||||
.suspend = smc911x_drv_suspend,
|
||||
.resume = smc911x_drv_resume,
|
||||
.driver = {
|
||||
|
Loading…
Reference in New Issue
Block a user