natsemi: 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:

committato da
Greg Kroah-Hartman

parent
19d1b44aa8
commit
6980cbe4a6
@@ -196,7 +196,7 @@ static const struct net_device_ops macsonic_netdev_ops = {
|
||||
.ndo_set_mac_address = eth_mac_addr,
|
||||
};
|
||||
|
||||
static int __devinit macsonic_init(struct net_device *dev)
|
||||
static int macsonic_init(struct net_device *dev)
|
||||
{
|
||||
struct sonic_local* lp = netdev_priv(dev);
|
||||
|
||||
@@ -245,7 +245,7 @@ static int __devinit macsonic_init(struct net_device *dev)
|
||||
memcmp(mac, "\x00\x80\x19", 3) && \
|
||||
memcmp(mac, "\x00\x05\x02", 3))
|
||||
|
||||
static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
|
||||
static void mac_onboard_sonic_ethernet_addr(struct net_device *dev)
|
||||
{
|
||||
struct sonic_local *lp = netdev_priv(dev);
|
||||
const int prom_addr = ONBOARD_SONIC_PROM_BASE;
|
||||
@@ -309,7 +309,7 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
|
||||
eth_hw_addr_random(dev);
|
||||
}
|
||||
|
||||
static int __devinit mac_onboard_sonic_probe(struct net_device *dev)
|
||||
static int mac_onboard_sonic_probe(struct net_device *dev)
|
||||
{
|
||||
struct sonic_local* lp = netdev_priv(dev);
|
||||
int sr;
|
||||
@@ -420,7 +420,7 @@ static int __devinit mac_onboard_sonic_probe(struct net_device *dev)
|
||||
return macsonic_init(dev);
|
||||
}
|
||||
|
||||
static int __devinit mac_nubus_sonic_ethernet_addr(struct net_device *dev,
|
||||
static int mac_nubus_sonic_ethernet_addr(struct net_device *dev,
|
||||
unsigned long prom_addr,
|
||||
int id)
|
||||
{
|
||||
@@ -435,7 +435,7 @@ static int __devinit mac_nubus_sonic_ethernet_addr(struct net_device *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit macsonic_ident(struct nubus_dev *ndev)
|
||||
static int macsonic_ident(struct nubus_dev *ndev)
|
||||
{
|
||||
if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC &&
|
||||
ndev->dr_sw == NUBUS_DRSW_SONIC_LC)
|
||||
@@ -460,7 +460,7 @@ static int __devinit macsonic_ident(struct nubus_dev *ndev)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int __devinit mac_nubus_sonic_probe(struct net_device *dev)
|
||||
static int mac_nubus_sonic_probe(struct net_device *dev)
|
||||
{
|
||||
static int slots;
|
||||
struct nubus_dev* ndev = NULL;
|
||||
@@ -573,7 +573,7 @@ static int __devinit mac_nubus_sonic_probe(struct net_device *dev)
|
||||
return macsonic_init(dev);
|
||||
}
|
||||
|
||||
static int __devinit mac_sonic_probe(struct platform_device *pdev)
|
||||
static int mac_sonic_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct sonic_local *lp;
|
||||
@@ -619,7 +619,7 @@ MODULE_ALIAS("platform:macsonic");
|
||||
|
||||
#include "sonic.c"
|
||||
|
||||
static int __devexit mac_sonic_device_remove (struct platform_device *pdev)
|
||||
static int mac_sonic_device_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct sonic_local* lp = netdev_priv(dev);
|
||||
@@ -634,7 +634,7 @@ static int __devexit mac_sonic_device_remove (struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mac_sonic_driver = {
|
||||
.probe = mac_sonic_probe,
|
||||
.remove = __devexit_p(mac_sonic_device_remove),
|
||||
.remove = mac_sonic_device_remove,
|
||||
.driver = {
|
||||
.name = mac_sonic_string,
|
||||
.owner = THIS_MODULE,
|
||||
|
Fai riferimento in un nuovo problema
Block a user