Skip to content

L
linux
Commit 6980cbe4 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19d1b44a
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
drivers/net/ethernet/natsemi/ibmlana.c
View file @ 6980cbe4
...@@ -900,7 +900,7 @@ static short ibmlana_adapter_ids[] __initdata = { ...@@ -900,7 +900,7 @@ static short ibmlana_adapter_ids[] __initdata = {
0x0000 0x0000
}; };
static char *ibmlana_adapter_names[] __devinitdata = { static char *ibmlana_adapter_names[] = {
"IBM LAN Adapter/A", "IBM LAN Adapter/A",
NULL NULL
}; };
...@@ -916,7 +916,7 @@ static const struct net_device_ops ibmlana_netdev_ops = { ...@@ -916,7 +916,7 @@ static const struct net_device_ops ibmlana_netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit ibmlana_init_one(struct device *kdev) static int ibmlana_init_one(struct device *kdev)
{ {
struct mca_device *mdev = to_mca_device(kdev); struct mca_device *mdev = to_mca_device(kdev);
struct net_device *dev; struct net_device *dev;
......
drivers/net/ethernet/natsemi/jazzsonic.c
View file @ 6980cbe4
...@@ -117,7 +117,7 @@ static const struct net_device_ops sonic_netdev_ops = { ...@@ -117,7 +117,7 @@ static const struct net_device_ops sonic_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
}; };
static int __devinit sonic_probe1(struct net_device *dev) static int sonic_probe1(struct net_device *dev)
{ {
static unsigned version_printed; static unsigned version_printed;
unsigned int silicon_revision; unsigned int silicon_revision;
...@@ -220,7 +220,7 @@ static int __devinit sonic_probe1(struct net_device *dev) ...@@ -220,7 +220,7 @@ static int __devinit sonic_probe1(struct net_device *dev)
* Probe for a SONIC ethernet controller on a Mips Jazz board. * Probe for a SONIC ethernet controller on a Mips Jazz board.
* Actually probing is superfluous but we're paranoid. * Actually probing is superfluous but we're paranoid.
*/ */
static int __devinit jazz_sonic_probe(struct platform_device *pdev) static int jazz_sonic_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct sonic_local *lp; struct sonic_local *lp;
...@@ -270,7 +270,7 @@ MODULE_ALIAS("platform:jazzsonic"); ...@@ -270,7 +270,7 @@ MODULE_ALIAS("platform:jazzsonic");
#include "sonic.c" #include "sonic.c"
static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) static int jazz_sonic_device_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct sonic_local* lp = netdev_priv(dev); struct sonic_local* lp = netdev_priv(dev);
...@@ -286,7 +286,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) ...@@ -286,7 +286,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
static struct platform_driver jazz_sonic_driver = { static struct platform_driver jazz_sonic_driver = {
.probe = jazz_sonic_probe, .probe = jazz_sonic_probe,
.remove = __devexit_p(jazz_sonic_device_remove), .remove = jazz_sonic_device_remove,
.driver = { .driver = {
.name = jazz_sonic_string, .name = jazz_sonic_string,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/net/ethernet/natsemi/macsonic.c
View file @ 6980cbe4
...@@ -196,7 +196,7 @@ static const struct net_device_ops macsonic_netdev_ops = { ...@@ -196,7 +196,7 @@ static const struct net_device_ops macsonic_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr, .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); struct sonic_local* lp = netdev_priv(dev);
...@@ -245,7 +245,7 @@ static int __devinit macsonic_init(struct net_device *dev) ...@@ -245,7 +245,7 @@ static int __devinit macsonic_init(struct net_device *dev)
memcmp(mac, "\x00\x80\x19", 3) && \ memcmp(mac, "\x00\x80\x19", 3) && \
memcmp(mac, "\x00\x05\x02", 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); struct sonic_local *lp = netdev_priv(dev);
const int prom_addr = ONBOARD_SONIC_PROM_BASE; const int prom_addr = ONBOARD_SONIC_PROM_BASE;
...@@ -309,7 +309,7 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev) ...@@ -309,7 +309,7 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
eth_hw_addr_random(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); struct sonic_local* lp = netdev_priv(dev);
int sr; int sr;
...@@ -420,7 +420,7 @@ static int __devinit mac_onboard_sonic_probe(struct net_device *dev) ...@@ -420,7 +420,7 @@ static int __devinit mac_onboard_sonic_probe(struct net_device *dev)
return macsonic_init(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, unsigned long prom_addr,
int id) int id)
{ {
...@@ -435,7 +435,7 @@ static int __devinit mac_nubus_sonic_ethernet_addr(struct net_device *dev, ...@@ -435,7 +435,7 @@ static int __devinit mac_nubus_sonic_ethernet_addr(struct net_device *dev,
return 0; 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 && if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC &&
ndev->dr_sw == NUBUS_DRSW_SONIC_LC) ndev->dr_sw == NUBUS_DRSW_SONIC_LC)
...@@ -460,7 +460,7 @@ static int __devinit macsonic_ident(struct nubus_dev *ndev) ...@@ -460,7 +460,7 @@ static int __devinit macsonic_ident(struct nubus_dev *ndev)
return -1; 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; static int slots;
struct nubus_dev* ndev = NULL; struct nubus_dev* ndev = NULL;
...@@ -573,7 +573,7 @@ static int __devinit mac_nubus_sonic_probe(struct net_device *dev) ...@@ -573,7 +573,7 @@ static int __devinit mac_nubus_sonic_probe(struct net_device *dev)
return macsonic_init(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 net_device *dev;
struct sonic_local *lp; struct sonic_local *lp;
...@@ -619,7 +619,7 @@ MODULE_ALIAS("platform:macsonic"); ...@@ -619,7 +619,7 @@ MODULE_ALIAS("platform:macsonic");
#include "sonic.c" #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 net_device *dev = platform_get_drvdata(pdev);
struct sonic_local* lp = netdev_priv(dev); struct sonic_local* lp = netdev_priv(dev);
...@@ -634,7 +634,7 @@ static int __devexit mac_sonic_device_remove (struct platform_device *pdev) ...@@ -634,7 +634,7 @@ static int __devexit mac_sonic_device_remove (struct platform_device *pdev)
static struct platform_driver mac_sonic_driver = { static struct platform_driver mac_sonic_driver = {
.probe = mac_sonic_probe, .probe = mac_sonic_probe,
.remove = __devexit_p(mac_sonic_device_remove), .remove = mac_sonic_device_remove,
.driver = { .driver = {
.name = mac_sonic_string, .name = mac_sonic_string,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/net/ethernet/natsemi/natsemi.c
View file @ 6980cbe4
...@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS]; ...@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS];
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */ #define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
/* These identify the driver base version and may not be removed. */ /* These identify the driver base version and may not be removed. */
static const char version[] __devinitconst = static const char version[] =
KERN_INFO DRV_NAME " dp8381x driver, version " KERN_INFO DRV_NAME " dp8381x driver, version "
DRV_VERSION ", " DRV_RELDATE "\n" DRV_VERSION ", " DRV_RELDATE "\n"
" originally by Donald Becker <becker@scyld.com>\n" " originally by Donald Becker <becker@scyld.com>\n"
...@@ -242,7 +242,7 @@ static struct { ...@@ -242,7 +242,7 @@ static struct {
const char *name; const char *name;
unsigned long flags; unsigned long flags;
unsigned int eeprom_size; unsigned int eeprom_size;
} natsemi_pci_info[] __devinitdata = { } natsemi_pci_info[] = {
{ "Aculab E1/T1 PMXc cPCI carrier card", NATSEMI_FLAG_IGNORE_PHY, 128 }, { "Aculab E1/T1 PMXc cPCI carrier card", NATSEMI_FLAG_IGNORE_PHY, 128 },
{ "NatSemi DP8381[56]", 0, 24 }, { "NatSemi DP8381[56]", 0, 24 },
}; };
...@@ -742,7 +742,7 @@ static void move_int_phy(struct net_device *dev, int addr) ...@@ -742,7 +742,7 @@ static void move_int_phy(struct net_device *dev, int addr)
udelay(1); udelay(1);
} }
static void __devinit natsemi_init_media (struct net_device *dev) static void natsemi_init_media(struct net_device *dev)
{ {
struct netdev_private *np = netdev_priv(dev); struct netdev_private *np = netdev_priv(dev);
u32 tmp; u32 tmp;
...@@ -797,8 +797,8 @@ static const struct net_device_ops natsemi_netdev_ops = { ...@@ -797,8 +797,8 @@ static const struct net_device_ops natsemi_netdev_ops = {
#endif #endif
}; };
static int __devinit natsemi_probe1 (struct pci_dev *pdev, static int natsemi_probe1(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
struct netdev_private *np; struct netdev_private *np;
...@@ -3214,7 +3214,7 @@ static int netdev_close(struct net_device *dev) ...@@ -3214,7 +3214,7 @@ static int netdev_close(struct net_device *dev)
} }
static void __devexit natsemi_remove1 (struct pci_dev *pdev) static void natsemi_remove1(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
void __iomem * ioaddr = ns_ioaddr(dev); void __iomem * ioaddr = ns_ioaddr(dev);
...@@ -3353,7 +3353,7 @@ static struct pci_driver natsemi_driver = { ...@@ -3353,7 +3353,7 @@ static struct pci_driver natsemi_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = natsemi_pci_tbl, .id_table = natsemi_pci_tbl,
.probe = natsemi_probe1, .probe = natsemi_probe1,
.remove = __devexit_p(natsemi_remove1), .remove = natsemi_remove1,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = natsemi_suspend, .suspend = natsemi_suspend,
.resume = natsemi_resume, .resume = natsemi_resume,
......
drivers/net/ethernet/natsemi/ns83820.c
View file @ 6980cbe4
...@@ -1941,7 +1941,7 @@ static const struct net_device_ops netdev_ops = { ...@@ -1941,7 +1941,7 @@ static const struct net_device_ops netdev_ops = {
.ndo_tx_timeout = ns83820_tx_timeout, .ndo_tx_timeout = ns83820_tx_timeout,
}; };
static int __devinit ns83820_init_one(struct pci_dev *pci_dev, static int ns83820_init_one(struct pci_dev *pci_dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct net_device *ndev; struct net_device *ndev;
...@@ -2241,7 +2241,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, ...@@ -2241,7 +2241,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
return err; return err;
} }
static void __devexit ns83820_remove_one(struct pci_dev *pci_dev) static void ns83820_remove_one(struct pci_dev *pci_dev)
{ {
struct net_device *ndev = pci_get_drvdata(pci_dev); struct net_device *ndev = pci_get_drvdata(pci_dev);
struct ns83820 *dev = PRIV(ndev); /* ok even if NULL */ struct ns83820 *dev = PRIV(ndev); /* ok even if NULL */
...@@ -2272,7 +2272,7 @@ static struct pci_driver driver = { ...@@ -2272,7 +2272,7 @@ static struct pci_driver driver = {
.name = "ns83820", .name = "ns83820",
.id_table = ns83820_pci_tbl, .id_table = ns83820_pci_tbl,
.probe = ns83820_init_one, .probe = ns83820_init_one,
.remove = __devexit_p(ns83820_remove_one), .remove = ns83820_remove_one,
#if 0 /* FIXME: implement */ #if 0 /* FIXME: implement */
.suspend = , .suspend = ,
.resume = , .resume = ,
......
drivers/net/ethernet/natsemi/xtsonic.c
View file @ 6980cbe4
...@@ -249,7 +249,7 @@ static int __init sonic_probe1(struct net_device *dev) ...@@ -249,7 +249,7 @@ static int __init sonic_probe1(struct net_device *dev)
* Actually probing is superfluous but we're paranoid. * Actually probing is superfluous but we're paranoid.
*/ */
int __devinit xtsonic_probe(struct platform_device *pdev) int xtsonic_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct sonic_local *lp; struct sonic_local *lp;
...@@ -297,7 +297,7 @@ MODULE_PARM_DESC(sonic_debug, "xtsonic debug level (1-4)"); ...@@ -297,7 +297,7 @@ MODULE_PARM_DESC(sonic_debug, "xtsonic debug level (1-4)");
#include "sonic.c" #include "sonic.c"
static int __devexit xtsonic_device_remove (struct platform_device *pdev) static int xtsonic_device_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct sonic_local *lp = netdev_priv(dev); struct sonic_local *lp = netdev_priv(dev);
...@@ -314,7 +314,7 @@ static int __devexit xtsonic_device_remove (struct platform_device *pdev) ...@@ -314,7 +314,7 @@ static int __devexit xtsonic_device_remove (struct platform_device *pdev)
static struct platform_driver xtsonic_driver = { static struct platform_driver xtsonic_driver = {
.probe = xtsonic_probe, .probe = xtsonic_probe,
.remove = __devexit_p(xtsonic_device_remove), .remove = xtsonic_device_remove,
.driver = { .driver = {
.name = xtsonic_string, .name = xtsonic_string,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7