hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hp100: 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>
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:11 -05:00 committed by Greg Kroah-Hartman
parent 0297be0709
commit 170b52b873
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/hp/hp100.c
View File

@ -308,7 +308,7 @@ static void wait(void)
* Read board id and convert to string. * Read board id and convert to string.
* Effectively same code as decode_eisa_sig * Effectively same code as decode_eisa_sig
*/ */
static __devinit const char *hp100_read_id(int ioaddr) static const char *hp100_read_id(int ioaddr)
{ {
int i; int i;
static char str[HP100_SIG_LEN]; static char str[HP100_SIG_LEN];
@ -447,7 +447,7 @@ static const struct net_device_ops hp100_netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, static int hp100_probe1(struct net_device *dev, int ioaddr,
u_char bus, struct pci_dev *pci_dev) u_char bus, struct pci_dev *pci_dev)
{ {
int i; int i;
@ -2866,7 +2866,7 @@ static int __init hp100_eisa_probe (struct device *gendev)
return err; return err;
} }
static int __devexit hp100_eisa_remove (struct device *gendev) static int hp100_eisa_remove(struct device *gendev)
{ {
struct net_device *dev = dev_get_drvdata(gendev); struct net_device *dev = dev_get_drvdata(gendev);
cleanup_dev(dev); cleanup_dev(dev);
@ -2878,13 +2878,13 @@ static struct eisa_driver hp100_eisa_driver = {
.driver = { .driver = {
.name = "hp100", .name = "hp100",
.probe = hp100_eisa_probe, .probe = hp100_eisa_probe,
.remove = __devexit_p (hp100_eisa_remove), .remove = hp100_eisa_remove,
} }
}; };
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinit hp100_pci_probe (struct pci_dev *pdev, static int hp100_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
@ -2937,7 +2937,7 @@ static int __devinit hp100_pci_probe (struct pci_dev *pdev,
return err; return err;
} }
static void __devexit hp100_pci_remove (struct pci_dev *pdev) static void hp100_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
@ -2950,7 +2950,7 @@ static struct pci_driver hp100_pci_driver = {
.name = "hp100", .name = "hp100",
.id_table = hp100_pci_tbl, .id_table = hp100_pci_tbl,
.probe = hp100_pci_probe, .probe = hp100_pci_probe,
.remove = __devexit_p(hp100_pci_remove), .remove = hp100_pci_remove,
}; };
#endif #endif