Revert "Get rid of _t suffix"

In the very least, a change like this requires discussion on the list.

The naming convention is goofy and it causes a massive merge problem.  Something
like this _must_ be presented on the list first so people can provide input
and cope with it.

This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index ad188c97c0..c0ebb8d715 100644
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -49,7 +49,7 @@ struct soc_dma_ch_s {
     int bytes;
     /* Initialised by the DMA module, call soc_dma_ch_update after writing.  */
     enum soc_dma_access_type type[2];
-    a_target_phys_addr vaddr[2];	/* Updated by .transfer_fn().  */
+    target_phys_addr_t vaddr[2];	/* Updated by .transfer_fn().  */
     /* Private */
     void *paddr[2];
     soc_dma_io_t io_fn[2];
@@ -89,25 +89,25 @@ void soc_dma_ch_update(struct soc_dma_ch_s *ch);
 void soc_dma_reset(struct soc_dma_s *s);
 struct soc_dma_s *soc_dma_init(int n);
 
-void soc_dma_port_add_fifo(struct soc_dma_s *dma, a_target_phys_addr virt_base,
+void soc_dma_port_add_fifo(struct soc_dma_s *dma, target_phys_addr_t virt_base,
                 soc_dma_io_t fn, void *opaque, int out);
 void soc_dma_port_add_mem(struct soc_dma_s *dma, uint8_t *phys_base,
-                a_target_phys_addr virt_base, size_t size);
+                target_phys_addr_t virt_base, size_t size);
 
 static inline void soc_dma_port_add_fifo_in(struct soc_dma_s *dma,
-                a_target_phys_addr virt_base, soc_dma_io_t fn, void *opaque)
+                target_phys_addr_t virt_base, soc_dma_io_t fn, void *opaque)
 {
     return soc_dma_port_add_fifo(dma, virt_base, fn, opaque, 0);
 }
 
 static inline void soc_dma_port_add_fifo_out(struct soc_dma_s *dma,
-                a_target_phys_addr virt_base, soc_dma_io_t fn, void *opaque)
+                target_phys_addr_t virt_base, soc_dma_io_t fn, void *opaque)
 {
     return soc_dma_port_add_fifo(dma, virt_base, fn, opaque, 1);
 }
 
 static inline void soc_dma_port_add_mem_ram(struct soc_dma_s *dma,
-                a_ram_addr offset, a_target_phys_addr virt_base, size_t size)
+                ram_addr_t offset, target_phys_addr_t virt_base, size_t size)
 {
     return soc_dma_port_add_mem(dma, qemu_get_ram_ptr(offset), virt_base, size);
 }