File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
drivers/net/ethernet/freescale Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -945,7 +945,6 @@ static void
945
945
fec_restart (struct net_device * ndev )
946
946
{
947
947
struct fec_enet_private * fep = netdev_priv (ndev );
948
- u32 val ;
949
948
u32 temp_mac [2 ];
950
949
u32 rcntl = OPT_FRAME_SIZE | 0x04 ;
951
950
u32 ecntl = 0x2 ; /* ETHEREN */
@@ -997,7 +996,8 @@ fec_restart(struct net_device *ndev)
997
996
998
997
#if !defined(CONFIG_M5272 )
999
998
if (fep -> quirks & FEC_QUIRK_HAS_RACC ) {
1000
- val = readl (fep -> hwp + FEC_RACC );
999
+ u32 val = readl (fep -> hwp + FEC_RACC );
1000
+
1001
1001
/* align IP header */
1002
1002
val |= FEC_RACC_SHIFT16 ;
1003
1003
if (fep -> csum_flags & FLAG_RX_CSUM_ENABLED )
@@ -1664,7 +1664,6 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
1664
1664
static void fec_get_mac (struct net_device * ndev )
1665
1665
{
1666
1666
struct fec_enet_private * fep = netdev_priv (ndev );
1667
- struct fec_platform_data * pdata = dev_get_platdata (& fep -> pdev -> dev );
1668
1667
unsigned char * iap , tmpaddr [ETH_ALEN ];
1669
1668
1670
1669
/*
@@ -1695,6 +1694,8 @@ static void fec_get_mac(struct net_device *ndev)
1695
1694
if (FEC_FLASHMAC )
1696
1695
iap = (unsigned char * )FEC_FLASHMAC ;
1697
1696
#else
1697
+ struct fec_platform_data * pdata = dev_get_platdata (& fep -> pdev -> dev );
1698
+
1698
1699
if (pdata )
1699
1700
iap = (unsigned char * )& pdata -> mac ;
1700
1701
#endif
You can’t perform that action at this time.
0 commit comments