]> err.no Git - linux-2.6/commitdiff
PS3: Remove the workaround no longer needed
authorMasakazu Mokuno <mokuno@sm.sony.co.jp>
Fri, 31 Aug 2007 13:25:09 +0000 (22:25 +0900)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:51:01 +0000 (16:51 -0700)
Removed the workaround that was needed for PS3 firmware versions
prior to the first release.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
CC: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/ps3_gelic_net.c

index 31c3092e66aff77128e77715f509fddfd4e82475..93c2c39a4a4954346beb2ec56315194c8863af0c 100644 (file)
@@ -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;
 }