Skip to content

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

8390: 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 2791cf7a
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
drivers/net/ethernet/8390/etherh.c
View file @ 4168ac0e
...@@ -521,7 +521,7 @@ static void __init etherh_banner(void) ...@@ -521,7 +521,7 @@ static void __init etherh_banner(void)
* Read the ethernet address string from the on board rom. * Read the ethernet address string from the on board rom.
* This is an ascii string... * This is an ascii string...
*/ */
static int __devinit etherh_addr(char *addr, struct expansion_card *ec) static int etherh_addr(char *addr, struct expansion_card *ec)
{ {
struct in_chunk_dir cd; struct in_chunk_dir cd;
char *s; char *s;
...@@ -651,7 +651,7 @@ static const struct net_device_ops etherh_netdev_ops = { ...@@ -651,7 +651,7 @@ static const struct net_device_ops etherh_netdev_ops = {
static u32 etherh_regoffsets[16]; static u32 etherh_regoffsets[16];
static u32 etherm_regoffsets[16]; static u32 etherm_regoffsets[16];
static int __devinit static int
etherh_probe(struct expansion_card *ec, const struct ecard_id *id) etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
{ {
const struct etherh_data *data = id->data; const struct etherh_data *data = id->data;
...@@ -769,7 +769,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -769,7 +769,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
return ret; return ret;
} }
static void __devexit etherh_remove(struct expansion_card *ec) static void etherh_remove(struct expansion_card *ec)
{ {
struct net_device *dev = ecard_get_drvdata(ec); struct net_device *dev = ecard_get_drvdata(ec);
...@@ -833,7 +833,7 @@ static const struct ecard_id etherh_ids[] = { ...@@ -833,7 +833,7 @@ static const struct ecard_id etherh_ids[] = {
static struct ecard_driver etherh_driver = { static struct ecard_driver etherh_driver = {
.probe = etherh_probe, .probe = etherh_probe,
.remove = __devexit_p(etherh_remove), .remove = etherh_remove,
.id_table = etherh_ids, .id_table = etherh_ids,
.drv = { .drv = {
.name = DRV_NAME, .name = DRV_NAME,
......
drivers/net/ethernet/8390/hydra.c
View file @ 4168ac0e
...@@ -53,9 +53,9 @@ static const char version[] = ...@@ -53,9 +53,9 @@ static const char version[] =
#define WORDSWAP(a) ((((a)>>8)&0xff) | ((a)<<8)) #define WORDSWAP(a) ((((a)>>8)&0xff) | ((a)<<8))
static int __devinit hydra_init_one(struct zorro_dev *z, static int hydra_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent); const struct zorro_device_id *ent);
static int __devinit hydra_init(struct zorro_dev *z); static int hydra_init(struct zorro_dev *z);
static int hydra_open(struct net_device *dev); static int hydra_open(struct net_device *dev);
static int hydra_close(struct net_device *dev); static int hydra_close(struct net_device *dev);
static void hydra_reset_8390(struct net_device *dev); static void hydra_reset_8390(struct net_device *dev);
...@@ -65,9 +65,9 @@ static void hydra_block_input(struct net_device *dev, int count, ...@@ -65,9 +65,9 @@ static void hydra_block_input(struct net_device *dev, int count,
struct sk_buff *skb, int ring_offset); struct sk_buff *skb, int ring_offset);
static void hydra_block_output(struct net_device *dev, int count, static void hydra_block_output(struct net_device *dev, int count,
const unsigned char *buf, int start_page); const unsigned char *buf, int start_page);
static void __devexit hydra_remove_one(struct zorro_dev *z); static void hydra_remove_one(struct zorro_dev *z);
static struct zorro_device_id hydra_zorro_tbl[] __devinitdata = { static struct zorro_device_id hydra_zorro_tbl[] = {
{ ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET }, { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
{ 0 } { 0 }
}; };
...@@ -77,10 +77,10 @@ static struct zorro_driver hydra_driver = { ...@@ -77,10 +77,10 @@ static struct zorro_driver hydra_driver = {
.name = "hydra", .name = "hydra",
.id_table = hydra_zorro_tbl, .id_table = hydra_zorro_tbl,
.probe = hydra_init_one, .probe = hydra_init_one,
.remove = __devexit_p(hydra_remove_one), .remove = hydra_remove_one,
}; };
static int __devinit hydra_init_one(struct zorro_dev *z, static int hydra_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent) const struct zorro_device_id *ent)
{ {
int err; int err;
...@@ -110,7 +110,7 @@ static const struct net_device_ops hydra_netdev_ops = { ...@@ -110,7 +110,7 @@ static const struct net_device_ops hydra_netdev_ops = {
#endif #endif
}; };
static int __devinit hydra_init(struct zorro_dev *z) static int hydra_init(struct zorro_dev *z)
{ {
struct net_device *dev; struct net_device *dev;
unsigned long board = ZTWO_VADDR(z->resource.start); unsigned long board = ZTWO_VADDR(z->resource.start);
...@@ -247,7 +247,7 @@ static void hydra_block_output(struct net_device *dev, int count, ...@@ -247,7 +247,7 @@ static void hydra_block_output(struct net_device *dev, int count,
z_memcpy_toio(mem_base+((start_page - NESM_START_PG)<<8), buf, count); z_memcpy_toio(mem_base+((start_page - NESM_START_PG)<<8), buf, count);
} }
static void __devexit hydra_remove_one(struct zorro_dev *z) static void hydra_remove_one(struct zorro_dev *z)
{ {
struct net_device *dev = zorro_get_drvdata(z); struct net_device *dev = zorro_get_drvdata(z);
......
drivers/net/ethernet/8390/ne2k-pci.c
View file @ 4168ac0e
...@@ -61,7 +61,7 @@ static int options[MAX_UNITS]; ...@@ -61,7 +61,7 @@ static int options[MAX_UNITS];
#include "8390.h" #include "8390.h"
/* 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 ".c:v" DRV_VERSION " " DRV_RELDATE KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
" D. Becker/P. Gortmaker\n"; " D. Becker/P. Gortmaker\n";
...@@ -119,7 +119,7 @@ enum ne2k_pci_chipsets { ...@@ -119,7 +119,7 @@ enum ne2k_pci_chipsets {
static struct { static struct {
char *name; char *name;
int flags; int flags;
} pci_clone_list[] __devinitdata = { } pci_clone_list[] = {
{"RealTek RTL-8029", REALTEK_FDX}, {"RealTek RTL-8029", REALTEK_FDX},
{"Winbond 89C940", 0}, {"Winbond 89C940", 0},
{"Compex RL2000", 0}, {"Compex RL2000", 0},
...@@ -215,8 +215,8 @@ static const struct net_device_ops ne2k_netdev_ops = { ...@@ -215,8 +215,8 @@ static const struct net_device_ops ne2k_netdev_ops = {
#endif #endif
}; };
static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, static int ne2k_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
int i; int i;
...@@ -647,7 +647,7 @@ static const struct ethtool_ops ne2k_pci_ethtool_ops = { ...@@ -647,7 +647,7 @@ static const struct ethtool_ops ne2k_pci_ethtool_ops = {
.get_drvinfo = ne2k_pci_get_drvinfo, .get_drvinfo = ne2k_pci_get_drvinfo,
}; };
static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev) static void ne2k_pci_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
...@@ -696,7 +696,7 @@ static int ne2k_pci_resume (struct pci_dev *pdev) ...@@ -696,7 +696,7 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
static struct pci_driver ne2k_driver = { static struct pci_driver ne2k_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.probe = ne2k_pci_init_one, .probe = ne2k_pci_init_one,
.remove = __devexit_p(ne2k_pci_remove_one), .remove = ne2k_pci_remove_one,
.id_table = ne2k_pci_tbl, .id_table = ne2k_pci_tbl,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = ne2k_pci_suspend, .suspend = ne2k_pci_suspend,
......
drivers/net/ethernet/8390/ne3210.c
View file @ 4168ac0e
...@@ -222,7 +222,7 @@ static int __init ne3210_eisa_probe (struct device *device) ...@@ -222,7 +222,7 @@ static int __init ne3210_eisa_probe (struct device *device)
return retval; return retval;
} }
static int __devexit ne3210_eisa_remove (struct device *device) static int ne3210_eisa_remove(struct device *device)
{ {
struct net_device *dev = dev_get_drvdata(device); struct net_device *dev = dev_get_drvdata(device);
unsigned long ioaddr = to_eisa_device (device)->base_addr; unsigned long ioaddr = to_eisa_device (device)->base_addr;
...@@ -324,7 +324,7 @@ static struct eisa_driver ne3210_eisa_driver = { ...@@ -324,7 +324,7 @@ static struct eisa_driver ne3210_eisa_driver = {
.driver = { .driver = {
.name = "ne3210", .name = "ne3210",
.probe = ne3210_eisa_probe, .probe = ne3210_eisa_probe,
.remove = __devexit_p (ne3210_eisa_remove), .remove = ne3210_eisa_remove,
}, },
}; };
......
drivers/net/ethernet/8390/zorro8390.c
View file @ 4168ac0e
...@@ -75,7 +75,7 @@ static struct card_info { ...@@ -75,7 +75,7 @@ static struct card_info {
zorro_id id; zorro_id id;
const char *name; const char *name;
unsigned int offset; unsigned int offset;
} cards[] __devinitdata = { } cards[] = {
{ ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, "Ariadne II", 0x0600 }, { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, "Ariadne II", 0x0600 },
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, "X-Surf", 0x8600 }, { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, "X-Surf", 0x8600 },
}; };
...@@ -254,7 +254,7 @@ static int zorro8390_close(struct net_device *dev) ...@@ -254,7 +254,7 @@ static int zorro8390_close(struct net_device *dev)
return 0; return 0;
} }
static void __devexit zorro8390_remove_one(struct zorro_dev *z) static void zorro8390_remove_one(struct zorro_dev *z)
{ {
struct net_device *dev = zorro_get_drvdata(z); struct net_device *dev = zorro_get_drvdata(z);
...@@ -264,7 +264,7 @@ static void __devexit zorro8390_remove_one(struct zorro_dev *z) ...@@ -264,7 +264,7 @@ static void __devexit zorro8390_remove_one(struct zorro_dev *z)
free_netdev(dev); free_netdev(dev);
} }
static struct zorro_device_id zorro8390_zorro_tbl[] __devinitdata = { static struct zorro_device_id zorro8390_zorro_tbl[] = {
{ ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, }, { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, },
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, }, { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, },
{ 0 } { 0 }
...@@ -286,7 +286,7 @@ static const struct net_device_ops zorro8390_netdev_ops = { ...@@ -286,7 +286,7 @@ static const struct net_device_ops zorro8390_netdev_ops = {
#endif #endif
}; };
static int __devinit zorro8390_init(struct net_device *dev, static int zorro8390_init(struct net_device *dev,
unsigned long board, const char *name, unsigned long board, const char *name,
unsigned long ioaddr) unsigned long ioaddr)
{ {
...@@ -396,7 +396,7 @@ static int __devinit zorro8390_init(struct net_device *dev, ...@@ -396,7 +396,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
return 0; return 0;
} }
static int __devinit zorro8390_init_one(struct zorro_dev *z, static int zorro8390_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent) const struct zorro_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
...@@ -432,7 +432,7 @@ static struct zorro_driver zorro8390_driver = { ...@@ -432,7 +432,7 @@ static struct zorro_driver zorro8390_driver = {
.name = "zorro8390", .name = "zorro8390",
.id_table = zorro8390_zorro_tbl, .id_table = zorro8390_zorro_tbl,
.probe = zorro8390_init_one, .probe = zorro8390_init_one,
.remove = __devexit_p(zorro8390_remove_one), .remove = zorro8390_remove_one,
}; };
static int __init zorro8390_init_module(void) static int __init zorro8390_init_module(void)
......
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