Patchwork [RFC,v1,2/4] xilinx.h: s/xilinx_axiethernetdma()/xilinx_axidma()

login
register
mail settings
Submitter Peter Crosthwaite
Date Feb. 12, 2013, 1:17 a.m.
Message ID <11f58f7ed9a4cae8af9cda7daf638d351159d60f.1360631576.git.peter.crosthwaite@xilinx.com>
Download mbox | patch
Permalink /patch/219724/
State New
Headers show

Comments

Peter Crosthwaite - Feb. 12, 2013, 1:17 a.m.
This function has nothing to do with ethernet. Its reusable for all DMA clients.
Dropped the "ethernet" in the name accordingly.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
---

 hw/petalogix_ml605_mmu.c |    4 ++--
 hw/xilinx.h              |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 8fd55a0..82d7183 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -140,8 +140,8 @@  petalogix_ml605_init(QEMUMachineInitArgs *args)
     xilinx_axiethernet_init(eth0, &nd_table[0], STREAM_SLAVE(dma),
                                    0x82780000, irq[3], 0x1000, 0x1000);
 
-    xilinx_axiethernetdma_init(dma, STREAM_SLAVE(eth0),
-                               0x84600000, irq[1], irq[0], 100 * 1000000);
+    xilinx_axidma_init(dma, STREAM_SLAVE(eth0), 0x84600000, irq[1], irq[0],
+                       100 * 1000000);
 
     {
         SSIBus *spi;
diff --git a/hw/xilinx.h b/hw/xilinx.h
index d255ca7..09bc2e4 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -71,9 +71,8 @@  xilinx_axiethernet_init(DeviceState *dev, NICInfo *nd, StreamSlave *peer,
 }
 
 static inline void
-xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
-                           hwaddr base, qemu_irq irq,
-                           qemu_irq irq2, int freqhz)
+xilinx_axidma_init(DeviceState *dev, StreamSlave *peer, hwaddr base,
+                   qemu_irq irq, qemu_irq irq2, int freqhz)
 {
     Error *errp = NULL;