forked from Minki/linux
qlge: 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: Ron Mercer <ron.mercer@qlogic.com> Cc: linux-driver@qlogic.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e3a582feac
commit
5d8e872657
@ -4491,7 +4491,7 @@ static void ql_release_all(struct pci_dev *pdev)
|
|||||||
pci_set_drvdata(pdev, NULL);
|
pci_set_drvdata(pdev, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit ql_init_device(struct pci_dev *pdev,
|
static int ql_init_device(struct pci_dev *pdev,
|
||||||
struct net_device *ndev, int cards_found)
|
struct net_device *ndev, int cards_found)
|
||||||
{
|
{
|
||||||
struct ql_adapter *qdev = netdev_priv(ndev);
|
struct ql_adapter *qdev = netdev_priv(ndev);
|
||||||
@ -4656,7 +4656,7 @@ static void ql_timer(unsigned long data)
|
|||||||
mod_timer(&qdev->timer, jiffies + (5*HZ));
|
mod_timer(&qdev->timer, jiffies + (5*HZ));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit qlge_probe(struct pci_dev *pdev,
|
static int qlge_probe(struct pci_dev *pdev,
|
||||||
const struct pci_device_id *pci_entry)
|
const struct pci_device_id *pci_entry)
|
||||||
{
|
{
|
||||||
struct net_device *ndev = NULL;
|
struct net_device *ndev = NULL;
|
||||||
@ -4729,7 +4729,7 @@ int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget)
|
|||||||
return ql_clean_inbound_rx_ring(rx_ring, budget);
|
return ql_clean_inbound_rx_ring(rx_ring, budget);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __devexit qlge_remove(struct pci_dev *pdev)
|
static void qlge_remove(struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
struct net_device *ndev = pci_get_drvdata(pdev);
|
struct net_device *ndev = pci_get_drvdata(pdev);
|
||||||
struct ql_adapter *qdev = netdev_priv(ndev);
|
struct ql_adapter *qdev = netdev_priv(ndev);
|
||||||
@ -4921,7 +4921,7 @@ static struct pci_driver qlge_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
.id_table = qlge_pci_tbl,
|
.id_table = qlge_pci_tbl,
|
||||||
.probe = qlge_probe,
|
.probe = qlge_probe,
|
||||||
.remove = __devexit_p(qlge_remove),
|
.remove = qlge_remove,
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
.suspend = qlge_suspend,
|
.suspend = qlge_suspend,
|
||||||
.resume = qlge_resume,
|
.resume = qlge_resume,
|
||||||
|
Loading…
Reference in New Issue
Block a user