Browse Source

r8169: fix static initializers.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Francois Romieu 14 years ago
parent
commit
3744100e05
1 changed files with 6 additions and 4 deletions
  1. 6 4
      drivers/net/r8169.c

+ 6 - 4
drivers/net/r8169.c

@@ -1621,7 +1621,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
 	 *
 	 *
 	 * (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
 	 * (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
 	 */
 	 */
-	static const struct {
+	static const struct rtl_mac_info {
 		u32 mask;
 		u32 mask;
 		u32 val;
 		u32 val;
 		int mac_version;
 		int mac_version;
@@ -1689,7 +1689,8 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
 
 
 		/* Catch-all */
 		/* Catch-all */
 		{ 0x00000000, 0x00000000,	RTL_GIGA_MAC_NONE   }
 		{ 0x00000000, 0x00000000,	RTL_GIGA_MAC_NONE   }
-	}, *p = mac_info;
+	};
+	const struct rtl_mac_info *p = mac_info;
 	u32 reg;
 	u32 reg;
 
 
 	reg = RTL_R32(TxConfig);
 	reg = RTL_R32(TxConfig);
@@ -3681,7 +3682,7 @@ static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)
 
 
 static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
 static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
 {
 {
-	static const struct {
+	static const struct rtl_cfg2_info {
 		u32 mac_version;
 		u32 mac_version;
 		u32 clk;
 		u32 clk;
 		u32 val;
 		u32 val;
@@ -3690,7 +3691,8 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
 		{ RTL_GIGA_MAC_VER_05, PCI_Clock_66MHz, 0x000fffff },
 		{ RTL_GIGA_MAC_VER_05, PCI_Clock_66MHz, 0x000fffff },
 		{ RTL_GIGA_MAC_VER_06, PCI_Clock_33MHz, 0x00ffff00 }, // 8110SCe
 		{ RTL_GIGA_MAC_VER_06, PCI_Clock_33MHz, 0x00ffff00 }, // 8110SCe
 		{ RTL_GIGA_MAC_VER_06, PCI_Clock_66MHz, 0x00ffffff }
 		{ RTL_GIGA_MAC_VER_06, PCI_Clock_66MHz, 0x00ffffff }
-	}, *p = cfg2_info;
+	};
+	const struct rtl_cfg2_info *p = cfg2_info;
 	unsigned int i;
 	unsigned int i;
 	u32 clk;
 	u32 clk;