Commit baf63293 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

r8169: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d8e8726

drivers/net/ethernet/realtek/r8169.c

+9 −9
Original line number Diff line number Diff line
@@ -3828,7 +3828,7 @@ static void rtl_disable_msi(struct pci_dev *pdev, struct rtl8169_private *tp) 
	}

}



static void __devinit rtl_init_mdio_ops(struct rtl8169_private *tp)

static void rtl_init_mdio_ops(struct rtl8169_private *tp)

{

	struct mdio_ops *ops = &tp->mdio_ops;
@@ -4080,7 +4080,7 @@ static void rtl_pll_power_up(struct rtl8169_private *tp) 
	rtl_generic_op(tp, tp->pll_power_ops.up);

}



static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)

static void rtl_init_pll_power_ops(struct rtl8169_private *tp)

{

	struct pll_power_ops *ops = &tp->pll_power_ops;
@@ -4274,7 +4274,7 @@ static void r8168b_1_hw_jumbo_disable(struct rtl8169_private *tp) 
	RTL_W8(Config4, RTL_R8(Config4) & ~(1 << 0));

}



static void __devinit rtl_init_jumbo_ops(struct rtl8169_private *tp)

static void rtl_init_jumbo_ops(struct rtl8169_private *tp)

{

	struct jumbo_ops *ops = &tp->jumbo_ops;
@@ -4715,7 +4715,7 @@ static u32 r8402_csi_read(struct rtl8169_private *tp, int addr) 
		RTL_R32(CSIDR) : ~0;

}



static void __devinit rtl_init_csi_ops(struct rtl8169_private *tp)

static void rtl_init_csi_ops(struct rtl8169_private *tp)

{

	struct csi_ops *ops = &tp->csi_ops;
@@ -6610,7 +6610,7 @@ static void rtl_shutdown(struct pci_dev *pdev) 
	pm_runtime_put_noidle(d);

}



static void __devexit rtl_remove_one(struct pci_dev *pdev)

static void rtl_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);
@@ -6730,7 +6730,7 @@ DECLARE_RTL_COND(rtl_rxtx_empty_cond) 
	return (RTL_R8(MCU) & RXTX_EMPTY) == RXTX_EMPTY;

}



static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp)

static void rtl_hw_init_8168g(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;

	u32 data;
@@ -6764,7 +6764,7 @@ static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp) 
		return;

}



static void __devinit rtl_hw_initialize(struct rtl8169_private *tp)

static void rtl_hw_initialize(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_40:
@@ -6777,7 +6777,7 @@ static void __devinit rtl_hw_initialize(struct rtl8169_private *tp) 
	}

}



static int __devinit

static int

rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
@@ -7028,7 +7028,7 @@ static struct pci_driver rtl8169_pci_driver = { 
	.name		= MODULENAME,

	.id_table	= rtl8169_pci_tbl,

	.probe		= rtl_init_one,

	.remove		= __devexit_p(rtl_remove_one),

	.remove		= rtl_remove_one,

	.shutdown	= rtl_shutdown,

	.driver.pm	= RTL8169_PM_OPS,

};