mirror of https://gitee.com/openkylin/linux.git
forcedeth: 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
26735f2f12
commit
d05919a148
|
@ -5520,7 +5520,7 @@ static const struct net_device_ops nv_netdev_ops_optimized = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
|
||||
static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct fe_priv *np;
|
||||
|
@ -5995,7 +5995,7 @@ static void nv_restore_mac_addr(struct pci_dev *pci_dev)
|
|||
base + NvRegTransmitPoll);
|
||||
}
|
||||
|
||||
static void __devexit nv_remove(struct pci_dev *pci_dev)
|
||||
static void nv_remove(struct pci_dev *pci_dev)
|
||||
{
|
||||
struct net_device *dev = pci_get_drvdata(pci_dev);
|
||||
|
||||
|
@ -6271,7 +6271,7 @@ static struct pci_driver driver = {
|
|||
.name = DRV_NAME,
|
||||
.id_table = pci_tbl,
|
||||
.probe = nv_probe,
|
||||
.remove = __devexit_p(nv_remove),
|
||||
.remove = nv_remove,
|
||||
.shutdown = nv_shutdown,
|
||||
.driver.pm = NV_PM_OPS,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue