mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
r6040: 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: Florian Fainelli <florian@openwrt.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b4e54a9442
commit
f1e242648b
@ -206,7 +206,7 @@ struct r6040_private {
|
||||
int old_duplex;
|
||||
};
|
||||
|
||||
static char version[] __devinitdata = DRV_NAME
|
||||
static char version[] = DRV_NAME
|
||||
": RDC R6040 NAPI net driver,"
|
||||
"version "DRV_VERSION " (" DRV_RELDATE ")";
|
||||
|
||||
@ -1073,7 +1073,7 @@ static int r6040_mii_probe(struct net_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit r6040_init_one(struct pci_dev *pdev,
|
||||
static int r6040_init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct net_device *dev;
|
||||
@ -1246,7 +1246,7 @@ err_out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __devexit r6040_remove_one(struct pci_dev *pdev)
|
||||
static void r6040_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct r6040_private *lp = netdev_priv(dev);
|
||||
@ -1274,7 +1274,7 @@ static struct pci_driver r6040_driver = {
|
||||
.name = DRV_NAME,
|
||||
.id_table = r6040_pci_tbl,
|
||||
.probe = r6040_init_one,
|
||||
.remove = __devexit_p(r6040_remove_one),
|
||||
.remove = r6040_remove_one,
|
||||
};
|
||||
|
||||
module_pci_driver(r6040_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user