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

diff --git a/hw/macio.c b/hw/macio.c
index 52d05d8e79..8cfadfc5e0 100644
--- a/hw/macio.c
+++ b/hw/macio.c
@@ -27,8 +27,8 @@
 #include "pci.h"
 #include "escc.h"
 
-typedef struct macio_state a_macio_state;
-struct macio_state {
+typedef struct macio_state_t macio_state_t;
+struct macio_state_t {
     int is_oldworld;
     int pic_mem_index;
     int dbdma_mem_index;
@@ -42,10 +42,10 @@ struct macio_state {
 static void macio_map (PCIDevice *pci_dev, int region_num,
                        uint32_t addr, uint32_t size, int type)
 {
-    a_macio_state *macio_state;
+    macio_state_t *macio_state;
     int i;
 
-    macio_state = (a_macio_state *)(pci_dev + 1);
+    macio_state = (macio_state_t *)(pci_dev + 1);
     if (macio_state->pic_mem_index >= 0) {
         if (macio_state->is_oldworld) {
             /* Heathrow PIC */
@@ -84,13 +84,13 @@ void macio_init (PCIBus *bus, int device_id, int is_oldworld, int pic_mem_index,
                  int nb_ide, int *ide_mem_index, int escc_mem_index)
 {
     PCIDevice *d;
-    a_macio_state *macio_state;
+    macio_state_t *macio_state;
     int i;
 
     d = pci_register_device(bus, "macio",
-                            sizeof(PCIDevice) + sizeof(a_macio_state),
+                            sizeof(PCIDevice) + sizeof(macio_state_t),
                             -1, NULL, NULL);
-    macio_state = (a_macio_state *)(d + 1);
+    macio_state = (macio_state_t *)(d + 1);
     macio_state->is_oldworld = is_oldworld;
     macio_state->pic_mem_index = pic_mem_index;
     macio_state->dbdma_mem_index = dbdma_mem_index;