Skip to content

Commit

Permalink
hp100: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent 0297be0 commit 170b52b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/net/ethernet/hp/hp100.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static void wait(void)
* Read board id and convert to string.
* 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;
static char str[HP100_SIG_LEN];
Expand Down Expand Up @@ -447,7 +447,7 @@ static const struct net_device_ops hp100_netdev_ops = {
.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)
{
int i;
Expand Down Expand Up @@ -2866,7 +2866,7 @@ static int __init hp100_eisa_probe (struct device *gendev)
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);
cleanup_dev(dev);
Expand All @@ -2878,14 +2878,14 @@ static struct eisa_driver hp100_eisa_driver = {
.driver = {
.name = "hp100",
.probe = hp100_eisa_probe,
.remove = __devexit_p (hp100_eisa_remove),
.remove = hp100_eisa_remove,
}
};
#endif

#ifdef CONFIG_PCI
static int __devinit hp100_pci_probe (struct pci_dev *pdev,
const struct pci_device_id *ent)
static int hp100_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
int ioaddr;
Expand Down Expand Up @@ -2937,7 +2937,7 @@ static int __devinit hp100_pci_probe (struct pci_dev *pdev,
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);

Expand All @@ -2950,7 +2950,7 @@ static struct pci_driver hp100_pci_driver = {
.name = "hp100",
.id_table = hp100_pci_tbl,
.probe = hp100_pci_probe,
.remove = __devexit_p(hp100_pci_remove),
.remove = hp100_pci_remove,
};
#endif

Expand Down

0 comments on commit 170b52b

Please sign in to comment.