Commit dc029ad9 authored by Masakazu Mokuno's avatar Masakazu Mokuno Committed by David S. Miller

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: default avatarMasakazu Mokuno <mokuno@sm.sony.co.jp>
CC: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 173261ed
...@@ -716,25 +716,17 @@ static int gelic_net_kick_txdma(struct gelic_net_card *card, ...@@ -716,25 +716,17 @@ static int gelic_net_kick_txdma(struct gelic_net_card *card,
struct gelic_net_descr *descr) struct gelic_net_descr *descr)
{ {
int status = 0; int status = 0;
int count = 10;
if (card->tx_dma_progress) if (card->tx_dma_progress)
return 0; return 0;
if (gelic_net_get_descr_status(descr) == GELIC_NET_DESCR_CARDOWNED) { if (gelic_net_get_descr_status(descr) == GELIC_NET_DESCR_CARDOWNED) {
card->tx_dma_progress = 1; card->tx_dma_progress = 1;
/* sometimes we need retry here */ status = lv1_net_start_tx_dma(bus_id(card), dev_id(card),
while (count--) {
status = lv1_net_start_tx_dma(bus_id(card),
dev_id(card),
descr->bus_addr, 0); descr->bus_addr, 0);
if (!status) if (status)
break;
}
if (!count)
dev_info(ctodev(card), "lv1_net_start_txdma failed," \ dev_info(ctodev(card), "lv1_net_start_txdma failed," \
"status=%d %#lx\n", "status=%d\n", status);
status, card->irq_status);
} }
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment