powerpc/ps3: Fix hcall lv1_net_stop_rx_dma
authorGeoff Levand <geoff@infradead.org>
Tue, 29 Nov 2011 15:38:49 +0000 (15:38 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Dec 2011 03:05:54 +0000 (14:05 +1100)
The lv1_net_stop_tx_dma and net_stop_rx_dma hcalls take 2, not 3 input
arguments.  Adjust the lv1 hcall table and all calls.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/lv1call.h
drivers/net/ethernet/toshiba/ps3_gelic_net.c

index f77c708..807d895 100644 (file)
@@ -294,9 +294,9 @@ LV1_CALL(unmap_device_dma_region,                       4, 0, 177 )
 LV1_CALL(net_add_multicast_address,                     4, 0, 185 )
 LV1_CALL(net_remove_multicast_address,                  4, 0, 186 )
 LV1_CALL(net_start_tx_dma,                              4, 0, 187 )
-LV1_CALL(net_stop_tx_dma,                               3, 0, 188 )
+LV1_CALL(net_stop_tx_dma,                               2, 0, 188 )
 LV1_CALL(net_start_rx_dma,                              4, 0, 189 )
-LV1_CALL(net_stop_rx_dma,                               3, 0, 190 )
+LV1_CALL(net_stop_rx_dma,                               2, 0, 190 )
 LV1_CALL(net_set_interrupt_status_indicator,            4, 0, 191 )
 LV1_CALL(net_set_interrupt_mask,                        4, 0, 193 )
 LV1_CALL(net_control,                                   6, 2, 194 )
index 7bf1e20..5ee82a7 100644 (file)
@@ -640,7 +640,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
        int status;
 
        /* this hvc blocks until the DMA in progress really stopped */
-       status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0);
+       status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card));
        if (status)
                dev_err(ctodev(card),
                        "lv1_net_stop_rx_dma failed, %d\n", status);
@@ -658,7 +658,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card)
        int status;
 
        /* this hvc blocks until the DMA in progress really stopped */
-       status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0);
+       status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card));
        if (status)
                dev_err(ctodev(card),
                        "lv1_net_stop_tx_dma failed, status=%d\n", status);