mirror of https://gitee.com/openkylin/linux.git
jme: 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: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
331774760a
commit
af37557b1b
|
@ -2965,7 +2965,7 @@ static const struct net_device_ops jme_netdev_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
jme_init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
|
@ -3203,7 +3203,7 @@ jme_init_one(struct pci_dev *pdev,
|
|||
return rc;
|
||||
}
|
||||
|
||||
static void __devexit
|
||||
static void
|
||||
jme_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
|
@ -3318,7 +3318,7 @@ static struct pci_driver jme_driver = {
|
|||
.name = DRV_NAME,
|
||||
.id_table = jme_pci_tbl,
|
||||
.probe = jme_init_one,
|
||||
.remove = __devexit_p(jme_remove_one),
|
||||
.remove = jme_remove_one,
|
||||
.shutdown = jme_shutdown,
|
||||
.driver.pm = JME_PM_OPS,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue