aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-08-31 07:44:51 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-15 15:56:40 -0400
commit8d5a89b3da78fd4cb17b261bf9d3b016c2120cac (patch)
tree98a1584e594c3159a00c9662304c24c54a4635ba /drivers/net/ethernet/broadcom
parent5b39de9178ce792862a414255dc98c970ec25a88 (diff)
tg3: Eliminate tg3_stop_fw() prototype
This patch moves tg3_stop_fw() earlier in the file to eliminate its prototype. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index d2f1ecb3f658..d1a71c8892a8 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -1396,6 +1396,22 @@ static void tg3_ump_link_report(struct tg3 *tp)
1396 tg3_generate_fw_event(tp); 1396 tg3_generate_fw_event(tp);
1397} 1397}
1398 1398
1399/* tp->lock is held. */
1400static void tg3_stop_fw(struct tg3 *tp)
1401{
1402 if (tg3_flag(tp, ENABLE_ASF) && !tg3_flag(tp, ENABLE_APE)) {
1403 /* Wait for RX cpu to ACK the previous event. */
1404 tg3_wait_for_event_ack(tp);
1405
1406 tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
1407
1408 tg3_generate_fw_event(tp);
1409
1410 /* Wait for RX cpu to ACK this event. */
1411 tg3_wait_for_event_ack(tp);
1412 }
1413}
1414
1399static void tg3_link_report(struct tg3 *tp) 1415static void tg3_link_report(struct tg3 *tp)
1400{ 1416{
1401 if (!netif_carrier_ok(tp->dev)) { 1417 if (!netif_carrier_ok(tp->dev)) {
@@ -7424,8 +7440,6 @@ static void tg3_restore_pci_state(struct tg3 *tp)
7424 } 7440 }
7425} 7441}
7426 7442
7427static void tg3_stop_fw(struct tg3 *);
7428
7429/* tp->lock is held. */ 7443/* tp->lock is held. */
7430static int tg3_chip_reset(struct tg3 *tp) 7444static int tg3_chip_reset(struct tg3 *tp)
7431{ 7445{
@@ -7673,22 +7687,6 @@ static int tg3_chip_reset(struct tg3 *tp)
7673} 7687}
7674 7688
7675/* tp->lock is held. */ 7689/* tp->lock is held. */
7676static void tg3_stop_fw(struct tg3 *tp)
7677{
7678 if (tg3_flag(tp, ENABLE_ASF) && !tg3_flag(tp, ENABLE_APE)) {
7679 /* Wait for RX cpu to ACK the previous event. */
7680 tg3_wait_for_event_ack(tp);
7681
7682 tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
7683
7684 tg3_generate_fw_event(tp);
7685
7686 /* Wait for RX cpu to ACK this event. */
7687 tg3_wait_for_event_ack(tp);
7688 }
7689}
7690
7691/* tp->lock is held. */
7692static int tg3_halt(struct tg3 *tp, int kind, int silent) 7690static int tg3_halt(struct tg3 *tp, int kind, int silent)
7693{ 7691{
7694 int err; 7692 int err;