tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

r8169: rename rtl_apply_firmware

Rename rtl_apply_firmware() to r8169_apply_firmware() before exporting
it to avoid namespace clashes with other drivers for Realtek hardware.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Heiner Kallweit and committed by
David S. Miller 1c5be5e9 00b522d1

+16 -16
+16 -16
drivers/net/ethernet/realtek/r8169_main.c
··· 2287 2287 } 2288 2288 } 2289 2289 2290 - static void rtl_apply_firmware(struct rtl8169_private *tp) 2290 + static void r8169_apply_firmware(struct rtl8169_private *tp) 2291 2291 { 2292 2292 /* TODO: release firmware if rtl_fw_write_firmware signals failure. */ 2293 2293 if (tp->rtl_fw) ··· 2683 2683 if (reg_val != val) 2684 2684 phydev_warn(phydev, "chipset not ready for firmware\n"); 2685 2685 else 2686 - rtl_apply_firmware(tp); 2686 + r8169_apply_firmware(tp); 2687 2687 } 2688 2688 2689 2689 static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp, ··· 2859 2859 { 0x1f, 0x0000 }, 2860 2860 }; 2861 2861 2862 - rtl_apply_firmware(tp); 2862 + r8169_apply_firmware(tp); 2863 2863 2864 2864 /* Enable Delay cap */ 2865 2865 r8168d_phy_param(phydev, 0x8b80, 0xffff, 0xc896); ··· 2907 2907 static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp, 2908 2908 struct phy_device *phydev) 2909 2909 { 2910 - rtl_apply_firmware(tp); 2910 + r8169_apply_firmware(tp); 2911 2911 2912 2912 /* Enable Delay cap */ 2913 2913 r8168d_modify_extpage(phydev, 0x00ac, 0x18, 0xffff, 0x0006); ··· 2965 2965 static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp, 2966 2966 struct phy_device *phydev) 2967 2967 { 2968 - rtl_apply_firmware(tp); 2968 + r8169_apply_firmware(tp); 2969 2969 2970 2970 /* Channel estimation fine tune */ 2971 2971 phy_write_paged(phydev, 0x0003, 0x09, 0xa20f); ··· 2993 2993 static void rtl8168f_2_hw_phy_config(struct rtl8169_private *tp, 2994 2994 struct phy_device *phydev) 2995 2995 { 2996 - rtl_apply_firmware(tp); 2996 + r8169_apply_firmware(tp); 2997 2997 2998 2998 rtl8168f_hw_phy_config(tp, phydev); 2999 2999 } ··· 3001 3001 static void rtl8411_hw_phy_config(struct rtl8169_private *tp, 3002 3002 struct phy_device *phydev) 3003 3003 { 3004 - rtl_apply_firmware(tp); 3004 + r8169_apply_firmware(tp); 3005 3005 3006 3006 rtl8168f_hw_phy_config(tp, phydev); 3007 3007 ··· 3062 3062 { 3063 3063 int ret; 3064 3064 3065 - rtl_apply_firmware(tp); 3065 + r8169_apply_firmware(tp); 3066 3066 3067 3067 ret = phy_read_paged(phydev, 0x0a46, 0x10); 3068 3068 if (ret & BIT(8)) ··· 3108 3108 static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp, 3109 3109 struct phy_device *phydev) 3110 3110 { 3111 - rtl_apply_firmware(tp); 3111 + r8169_apply_firmware(tp); 3112 3112 rtl8168g_config_eee_phy(phydev); 3113 3113 } 3114 3114 ··· 3118 3118 u16 dout_tapbin; 3119 3119 u32 data; 3120 3120 3121 - rtl_apply_firmware(tp); 3121 + r8169_apply_firmware(tp); 3122 3122 3123 3123 /* CHN EST parameters adjust - giga master */ 3124 3124 r8168g_phy_param(phydev, 0x809b, 0xf800, 0x8000); ··· 3200 3200 u16 ioffset, rlen; 3201 3201 u32 data; 3202 3202 3203 - rtl_apply_firmware(tp); 3203 + r8169_apply_firmware(tp); 3204 3204 3205 3205 /* CHIN EST parameter update */ 3206 3206 r8168g_phy_param(phydev, 0x808a, 0x003f, 0x000a); ··· 3365 3365 phy_write(phydev, 0x18, 0x0310); 3366 3366 msleep(100); 3367 3367 3368 - rtl_apply_firmware(tp); 3368 + r8169_apply_firmware(tp); 3369 3369 3370 3370 phy_write_paged(phydev, 0x0005, 0x1a, 0x0000); 3371 3371 phy_write_paged(phydev, 0x0004, 0x1c, 0x0000); ··· 3379 3379 phy_write(phydev, 0x18, 0x0310); 3380 3380 msleep(20); 3381 3381 3382 - rtl_apply_firmware(tp); 3382 + r8169_apply_firmware(tp); 3383 3383 3384 3384 /* EEE setting */ 3385 3385 phy_write(phydev, 0x1f, 0x0004); ··· 3402 3402 phy_write(phydev, 0x18, 0x0310); 3403 3403 msleep(100); 3404 3404 3405 - rtl_apply_firmware(tp); 3405 + r8169_apply_firmware(tp); 3406 3406 3407 3407 rtl_writephy_batch(phydev, phy_reg_init); 3408 3408 } ··· 3494 3494 r8168g_phy_param(phydev, 0x8257, 0xffff, 0x020F); 3495 3495 r8168g_phy_param(phydev, 0x80ea, 0xffff, 0x7843); 3496 3496 3497 - rtl_apply_firmware(tp); 3497 + r8169_apply_firmware(tp); 3498 3498 3499 3499 phy_modify_paged(phydev, 0xd06, 0x14, 0x0000, 0x2000); 3500 3500 ··· 4857 4857 r8168_mac_ocp_write(tp, 0xc09e, 0x0000); 4858 4858 4859 4859 /* firmware is for MAC only */ 4860 - rtl_apply_firmware(tp); 4860 + r8169_apply_firmware(tp); 4861 4861 4862 4862 rtl_hw_aspm_clkreq_enable(tp, true); 4863 4863 }