diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-01-28 18:03:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-01 03:58:21 -0500 |
commit | 6a8ea2c6f5521096b9972c75f7ad7b5303bce29c (patch) | |
tree | aaef506d0e805f5952ba85603efa9b3143c819de /drivers/net/fec.c | |
parent | 51bbc3e31cb59d94b0c9c1ca3f1851b7f1787169 (diff) |
fec: remove empty functions
There are some architecture specific functions which are all
empty. Remove them.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r-- | drivers/net/fec.c | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index b754f600e44f..f913c97bb816 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -1306,10 +1306,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) | |||
1306 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; | 1306 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; |
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | static void __inline__ fec_enable_phy_intr(void) | ||
1310 | { | ||
1311 | } | ||
1312 | |||
1313 | static void __inline__ fec_disable_phy_intr(void) | 1309 | static void __inline__ fec_disable_phy_intr(void) |
1314 | { | 1310 | { |
1315 | volatile unsigned long *icrp; | 1311 | volatile unsigned long *icrp; |
@@ -1325,17 +1321,6 @@ static void __inline__ fec_phy_ack_intr(void) | |||
1325 | *icrp = 0x0d000000; | 1321 | *icrp = 0x0d000000; |
1326 | } | 1322 | } |
1327 | 1323 | ||
1328 | static void __inline__ fec_localhw_setup(void) | ||
1329 | { | ||
1330 | } | ||
1331 | |||
1332 | /* | ||
1333 | * Do not need to make region uncached on 5272. | ||
1334 | */ | ||
1335 | static void __inline__ fec_uncache(unsigned long addr) | ||
1336 | { | ||
1337 | } | ||
1338 | |||
1339 | /* ------------------------------------------------------------------------- */ | 1324 | /* ------------------------------------------------------------------------- */ |
1340 | 1325 | ||
1341 | #elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) | 1326 | #elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) |
@@ -1475,10 +1460,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) | |||
1475 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; | 1460 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; |
1476 | } | 1461 | } |
1477 | 1462 | ||
1478 | static void __inline__ fec_enable_phy_intr(void) | ||
1479 | { | ||
1480 | } | ||
1481 | |||
1482 | static void __inline__ fec_disable_phy_intr(void) | 1463 | static void __inline__ fec_disable_phy_intr(void) |
1483 | { | 1464 | { |
1484 | } | 1465 | } |
@@ -1487,17 +1468,6 @@ static void __inline__ fec_phy_ack_intr(void) | |||
1487 | { | 1468 | { |
1488 | } | 1469 | } |
1489 | 1470 | ||
1490 | static void __inline__ fec_localhw_setup(void) | ||
1491 | { | ||
1492 | } | ||
1493 | |||
1494 | /* | ||
1495 | * Do not need to make region uncached on 5272. | ||
1496 | */ | ||
1497 | static void __inline__ fec_uncache(unsigned long addr) | ||
1498 | { | ||
1499 | } | ||
1500 | |||
1501 | /* ------------------------------------------------------------------------- */ | 1471 | /* ------------------------------------------------------------------------- */ |
1502 | 1472 | ||
1503 | #elif defined(CONFIG_M520x) | 1473 | #elif defined(CONFIG_M520x) |
@@ -1596,10 +1566,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) | |||
1596 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; | 1566 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; |
1597 | } | 1567 | } |
1598 | 1568 | ||
1599 | static void __inline__ fec_enable_phy_intr(void) | ||
1600 | { | ||
1601 | } | ||
1602 | |||
1603 | static void __inline__ fec_disable_phy_intr(void) | 1569 | static void __inline__ fec_disable_phy_intr(void) |
1604 | { | 1570 | { |
1605 | } | 1571 | } |
@@ -1608,14 +1574,6 @@ static void __inline__ fec_phy_ack_intr(void) | |||
1608 | { | 1574 | { |
1609 | } | 1575 | } |
1610 | 1576 | ||
1611 | static void __inline__ fec_localhw_setup(void) | ||
1612 | { | ||
1613 | } | ||
1614 | |||
1615 | static void __inline__ fec_uncache(unsigned long addr) | ||
1616 | { | ||
1617 | } | ||
1618 | |||
1619 | /* ------------------------------------------------------------------------- */ | 1577 | /* ------------------------------------------------------------------------- */ |
1620 | 1578 | ||
1621 | #elif defined(CONFIG_M532x) | 1579 | #elif defined(CONFIG_M532x) |
@@ -1735,10 +1693,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) | |||
1735 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; | 1693 | dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; |
1736 | } | 1694 | } |
1737 | 1695 | ||
1738 | static void __inline__ fec_enable_phy_intr(void) | ||
1739 | { | ||
1740 | } | ||
1741 | |||
1742 | static void __inline__ fec_disable_phy_intr(void) | 1696 | static void __inline__ fec_disable_phy_intr(void) |
1743 | { | 1697 | { |
1744 | } | 1698 | } |
@@ -1747,17 +1701,6 @@ static void __inline__ fec_phy_ack_intr(void) | |||
1747 | { | 1701 | { |
1748 | } | 1702 | } |
1749 | 1703 | ||
1750 | static void __inline__ fec_localhw_setup(void) | ||
1751 | { | ||
1752 | } | ||
1753 | |||
1754 | /* | ||
1755 | * Do not need to make region uncached on 532x. | ||
1756 | */ | ||
1757 | static void __inline__ fec_uncache(unsigned long addr) | ||
1758 | { | ||
1759 | } | ||
1760 | |||
1761 | #endif | 1704 | #endif |
1762 | 1705 | ||
1763 | /* ------------------------------------------------------------------------- */ | 1706 | /* ------------------------------------------------------------------------- */ |
@@ -2199,8 +2142,6 @@ int __init fec_enet_init(struct net_device *dev) | |||
2199 | cbd_base = (cbd_t *)mem_addr; | 2142 | cbd_base = (cbd_t *)mem_addr; |
2200 | /* XXX: missing check for allocation failure */ | 2143 | /* XXX: missing check for allocation failure */ |
2201 | 2144 | ||
2202 | fec_uncache(mem_addr); | ||
2203 | |||
2204 | /* Set receive and transmit descriptor base. | 2145 | /* Set receive and transmit descriptor base. |
2205 | */ | 2146 | */ |
2206 | fep->rx_bd_base = cbd_base; | 2147 | fep->rx_bd_base = cbd_base; |
@@ -2221,8 +2162,6 @@ int __init fec_enet_init(struct net_device *dev) | |||
2221 | mem_addr = __get_free_page(GFP_KERNEL); | 2162 | mem_addr = __get_free_page(GFP_KERNEL); |
2222 | /* XXX: missing check for allocation failure */ | 2163 | /* XXX: missing check for allocation failure */ |
2223 | 2164 | ||
2224 | fec_uncache(mem_addr); | ||
2225 | |||
2226 | /* Initialize the BD for every fragment in the page. | 2165 | /* Initialize the BD for every fragment in the page. |
2227 | */ | 2166 | */ |
2228 | for (j=0; j<FEC_ENET_RX_FRPPG; j++) { | 2167 | for (j=0; j<FEC_ENET_RX_FRPPG; j++) { |
@@ -2338,7 +2277,6 @@ fec_restart(struct net_device *dev, int duplex) | |||
2338 | /* Clear any outstanding interrupt. | 2277 | /* Clear any outstanding interrupt. |
2339 | */ | 2278 | */ |
2340 | fecp->fec_ievent = 0xffc00000; | 2279 | fecp->fec_ievent = 0xffc00000; |
2341 | fec_enable_phy_intr(); | ||
2342 | 2280 | ||
2343 | /* Set station address. | 2281 | /* Set station address. |
2344 | */ | 2282 | */ |
@@ -2353,8 +2291,6 @@ fec_restart(struct net_device *dev, int duplex) | |||
2353 | */ | 2291 | */ |
2354 | fecp->fec_r_buff_size = PKT_MAXBLR_SIZE; | 2292 | fecp->fec_r_buff_size = PKT_MAXBLR_SIZE; |
2355 | 2293 | ||
2356 | fec_localhw_setup(); | ||
2357 | |||
2358 | /* Set receive and transmit descriptor base. | 2294 | /* Set receive and transmit descriptor base. |
2359 | */ | 2295 | */ |
2360 | fecp->fec_r_des_start = __pa((uint)(fep->rx_bd_base)); | 2296 | fecp->fec_r_des_start = __pa((uint)(fep->rx_bd_base)); |
@@ -2460,7 +2396,6 @@ fec_stop(struct net_device *dev) | |||
2460 | /* Clear outstanding MII command interrupts. | 2396 | /* Clear outstanding MII command interrupts. |
2461 | */ | 2397 | */ |
2462 | fecp->fec_ievent = FEC_ENET_MII; | 2398 | fecp->fec_ievent = FEC_ENET_MII; |
2463 | fec_enable_phy_intr(); | ||
2464 | 2399 | ||
2465 | fecp->fec_imask = FEC_ENET_MII; | 2400 | fecp->fec_imask = FEC_ENET_MII; |
2466 | fecp->fec_mii_speed = fep->phy_speed; | 2401 | fecp->fec_mii_speed = fep->phy_speed; |