mirror of https://gitee.com/openkylin/linux.git
qlcnic: 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: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Cc: Sony Chacko <sony.chacko@qlogic.com> Cc: linux-driver@qlogic.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c3f9c88c1c
commit
6bb58bb0af
|
@ -54,9 +54,9 @@ static int qlcnic_config_npars;
|
|||
module_param(qlcnic_config_npars, int, 0444);
|
||||
MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled");
|
||||
|
||||
static int __devinit qlcnic_probe(struct pci_dev *pdev,
|
||||
static int qlcnic_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent);
|
||||
static void __devexit qlcnic_remove(struct pci_dev *pdev);
|
||||
static void qlcnic_remove(struct pci_dev *pdev);
|
||||
static int qlcnic_open(struct net_device *netdev);
|
||||
static int qlcnic_close(struct net_device *netdev);
|
||||
static void qlcnic_tx_timeout(struct net_device *netdev);
|
||||
|
@ -1454,7 +1454,7 @@ qlcnic_alloc_msix_entries(struct qlcnic_adapter *adapter, u16 count)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct net_device *netdev = NULL;
|
||||
|
@ -1618,7 +1618,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit qlcnic_remove(struct pci_dev *pdev)
|
||||
static void qlcnic_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct qlcnic_adapter *adapter;
|
||||
struct net_device *netdev;
|
||||
|
@ -2928,7 +2928,7 @@ static struct pci_driver qlcnic_driver = {
|
|||
.name = qlcnic_driver_name,
|
||||
.id_table = qlcnic_pci_tbl,
|
||||
.probe = qlcnic_probe,
|
||||
.remove = __devexit_p(qlcnic_remove),
|
||||
.remove = qlcnic_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = qlcnic_suspend,
|
||||
.resume = qlcnic_resume,
|
||||
|
|
Loading…
Reference in New Issue