Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dc029ad97f267cbd1c2e978a443eb5ae93a55328
Commit:     dc029ad97f267cbd1c2e978a443eb5ae93a55328
Parent:     173261ed37e7a98cedfcc808eb07eeceee66e078
Author:     Masakazu Mokuno <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 31 22:25:09 2007 +0900
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:51:01 2007 -0700

    PS3: Remove the workaround no longer needed
    
    Removed the workaround that was needed for PS3 firmware versions
    prior to the first release.
    
    Signed-off-by: Masakazu Mokuno <[EMAIL PROTECTED]>
    CC: Geoff Levand <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ps3_gelic_net.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 31c3092..93c2c39 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -716,25 +716,17 @@ static int gelic_net_kick_txdma(struct gelic_net_card 
*card,
                                struct gelic_net_descr *descr)
 {
        int status = 0;
-       int count = 10;
 
        if (card->tx_dma_progress)
                return 0;
 
        if (gelic_net_get_descr_status(descr) == GELIC_NET_DESCR_CARDOWNED) {
                card->tx_dma_progress = 1;
-               /* sometimes we need retry here */
-               while (count--) {
-                       status = lv1_net_start_tx_dma(bus_id(card),
-                                                     dev_id(card),
-                                                     descr->bus_addr, 0);
-                       if (!status)
-                               break;
-               }
-               if (!count)
+               status = lv1_net_start_tx_dma(bus_id(card), dev_id(card),
+                                             descr->bus_addr, 0);
+               if (status)
                        dev_info(ctodev(card), "lv1_net_start_txdma failed," \
-                               "status=%d %#lx\n",
-                                status, card->irq_status);
+                                "status=%d\n", status);
        }
        return status;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to