Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e27566ed authored by Francois Romieu's avatar Francois Romieu
Browse files

r8169: move the driver removal method to the end of the driver file. 



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
parent b2d3298e

drivers/net/ethernet/realtek/r8169.c

+29 −29
Original line number Diff line number Diff line
@@ -4263,34 +4263,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	goto out;

}



static void __devexit rtl8169_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);



	if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_28 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_31) {

		rtl8168_driver_stop(tp);

	}



	cancel_work_sync(&tp->wk.work);



	unregister_netdev(dev);



	rtl_release_firmware(tp);



	if (pci_dev_run_wake(pdev))

		pm_runtime_get_noresume(&pdev->dev);



	/* restore original MAC address */

	rtl_rar_set(tp, dev->perm_addr);



	rtl_disable_msi(pdev, tp);

	rtl8169_release_board(pdev, dev, tp->mmio_addr);

	pci_set_drvdata(pdev, NULL);

}



static void rtl_request_uncached_firmware(struct rtl8169_private *tp)

{

	struct rtl_fw *rtl_fw;
@@ -6316,11 +6288,39 @@ static void rtl_shutdown(struct pci_dev *pdev) 
	pm_runtime_put_noidle(d);

}



static void __devexit rtl_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);



	if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_28 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_31) {

		rtl8168_driver_stop(tp);

	}



	cancel_work_sync(&tp->wk.work);



	unregister_netdev(dev);



	rtl_release_firmware(tp);



	if (pci_dev_run_wake(pdev))

		pm_runtime_get_noresume(&pdev->dev);



	/* restore original MAC address */

	rtl_rar_set(tp, dev->perm_addr);



	rtl_disable_msi(pdev, tp);

	rtl8169_release_board(pdev, dev, tp->mmio_addr);

	pci_set_drvdata(pdev, NULL);

}



static struct pci_driver rtl8169_pci_driver = {

	.name		= MODULENAME,

	.id_table	= rtl8169_pci_tbl,

	.probe		= rtl8169_init_one,

	.remove		= __devexit_p(rtl8169_remove_one),

	.remove		= __devexit_p(rtl_remove_one),

	.shutdown	= rtl_shutdown,

	.driver.pm	= RTL8169_PM_OPS,

};