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, 8 insertions, 8 deletions

diff --git a/hw/spitz.c b/hw/spitz.c
index 48409a66f8..564519b2c7 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -50,7 +50,7 @@ typedef struct {
     ECCState ecc;
 } SLNANDState;
 
-static uint32_t sl_readb(void *opaque, a_target_phys_addr addr)
+static uint32_t sl_readb(void *opaque, target_phys_addr_t addr)
 {
     SLNANDState *s = (SLNANDState *) opaque;
     int ryby;
@@ -88,7 +88,7 @@ static uint32_t sl_readb(void *opaque, a_target_phys_addr addr)
     return 0;
 }
 
-static uint32_t sl_readl(void *opaque, a_target_phys_addr addr)
+static uint32_t sl_readl(void *opaque, target_phys_addr_t addr)
 {
     SLNANDState *s = (SLNANDState *) opaque;
 
@@ -99,7 +99,7 @@ static uint32_t sl_readl(void *opaque, a_target_phys_addr addr)
     return sl_readb(opaque, addr);
 }
 
-static void sl_writeb(void *opaque, a_target_phys_addr addr,
+static void sl_writeb(void *opaque, target_phys_addr_t addr,
                 uint32_t value)
 {
     SLNANDState *s = (SLNANDState *) opaque;
@@ -948,7 +948,7 @@ static struct arm_boot_info spitz_binfo = {
     .ram_size = 0x04000000,
 };
 
-static void spitz_common_init(a_ram_addr ram_size,
+static void spitz_common_init(ram_addr_t ram_size,
                 const char *kernel_filename,
                 const char *kernel_cmdline, const char *initrd_filename,
                 const char *cpu_model, enum spitz_model_e model, int arm_id)
@@ -1004,7 +1004,7 @@ static void spitz_common_init(a_ram_addr ram_size,
     sl_bootparam_write(SL_PXA_PARAM_BASE);
 }
 
-static void spitz_init(a_ram_addr ram_size,
+static void spitz_init(ram_addr_t ram_size,
                 const char *boot_device,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
@@ -1013,7 +1013,7 @@ static void spitz_init(a_ram_addr ram_size,
                 kernel_cmdline, initrd_filename, cpu_model, spitz, 0x2c9);
 }
 
-static void borzoi_init(a_ram_addr ram_size,
+static void borzoi_init(ram_addr_t ram_size,
                 const char *boot_device,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
@@ -1022,7 +1022,7 @@ static void borzoi_init(a_ram_addr ram_size,
                 kernel_cmdline, initrd_filename, cpu_model, borzoi, 0x33f);
 }
 
-static void akita_init(a_ram_addr ram_size,
+static void akita_init(ram_addr_t ram_size,
                 const char *boot_device,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
@@ -1031,7 +1031,7 @@ static void akita_init(a_ram_addr ram_size,
                 kernel_cmdline, initrd_filename, cpu_model, akita, 0x2e8);
 }
 
-static void terrier_init(a_ram_addr ram_size,
+static void terrier_init(ram_addr_t ram_size,
                 const char *boot_device,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)