[IA64] Cleanup of arch/ia64/sn and include/asm-ia64/sn

Replace uintX_t declarations with uX declarations.
Replace intX_t declarations with sX declarations.

Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

3 files changed, 19 insertions, 19 deletions

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 258d9d7aff98..233d55115d33 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -132,8 +132,8 @@ static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
  * Retrieve the pci device information given the bus and device|function number.
  */
 static inline u64
-sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev, 
-                        u64 sn_irq_info)
+sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
+                    u64 sn_irq_info)
 {
         struct ia64_sal_retval ret_stuff;
         ret_stuff.status = 0;
@@ -141,7 +141,7 @@ sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
 
         SAL_CALL_NOLOCK(ret_stuff,
                         (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
-                        (u64) segment, (u64) bus_number, (u64) devfn, 
+                        (u64) segment, (u64) bus_number, (u64) devfn,
                         (u64) pci_dev,
                         sn_irq_info, 0, 0);
         return ret_stuff.v0;
@@ -268,7 +268,7 @@ static void sn_fixup_ionodes(void)
  */
 static void
 sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
-                    int64_t * pci_addrs)
+                    s64 * pci_addrs)
 {
         struct pci_controller *controller = PCI_CONTROLLER(dev->bus);
         unsigned int i;
@@ -328,7 +328,7 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
         struct pci_bus *host_pci_bus;
         struct pci_dev *host_pci_dev;
         struct pcidev_info *pcidev_info;
-        int64_t pci_addrs[PCI_ROM_RESOURCE + 1];
+        s64 pci_addrs[PCI_ROM_RESOURCE + 1];
         struct sn_irq_info *sn_irq_info;
         unsigned long size;
         unsigned int bus_no, devfn;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 01d18b7b5bb3..ec37084bdc17 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -28,7 +28,7 @@ extern int sn_ioif_inited;
 static struct list_head **sn_irq_lh;
 static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */
 
-static inline uint64_t sn_intr_alloc(nasid_t local_nasid, int local_widget,
+static inline u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,
                                      u64 sn_irq_info,
                                      int req_irq, nasid_t req_nasid,
                                      int req_slice)
@@ -123,7 +123,7 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
 
         list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe,
                                  sn_irq_lh[irq], list) {
-                uint64_t bridge;
+                u64 bridge;
                 int local_widget, status;
                 nasid_t local_nasid;
                 struct sn_irq_info *new_irq_info;
@@ -134,7 +134,7 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
                         break;
                 memcpy(new_irq_info, sn_irq_info, sizeof(struct sn_irq_info));
 
-                bridge = (uint64_t) new_irq_info->irq_bridge;
+                bridge = (u64) new_irq_info->irq_bridge;
                 if (!bridge) {
                         kfree(new_irq_info);
                         break; /* irq is not a device interrupt */
@@ -349,10 +349,10 @@ static void force_interrupt(int irq)
  */
 static void sn_check_intr(int irq, struct sn_irq_info *sn_irq_info)
 {
-        uint64_t regval;
+        u64 regval;
         int irr_reg_num;
         int irr_bit;
-        uint64_t irr_reg;
+        u64 irr_reg;
         struct pcidev_info *pcidev_info;
         struct pcibus_info *pcibus_info;
 
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 6a7939b16a1c..d263d3e8fbb9 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -245,7 +245,7 @@ static int cx_device_reload(struct cx_dev *cx_dev)
                                   cx_dev->bt);
 }
 
-static inline uint64_t tiocx_intr_alloc(nasid_t nasid, int widget,
+static inline u64 tiocx_intr_alloc(nasid_t nasid, int widget,
                                         u64 sn_irq_info,
                                         int req_irq, nasid_t req_nasid,
                                         int req_slice)
@@ -302,7 +302,7 @@ struct sn_irq_info *tiocx_irq_alloc(nasid_t nasid, int widget, int irq,
 
 void tiocx_irq_free(struct sn_irq_info *sn_irq_info)
 {
-        uint64_t bridge = (uint64_t) sn_irq_info->irq_bridge;
+        u64 bridge = (u64) sn_irq_info->irq_bridge;
         nasid_t nasid = NASID_GET(bridge);
         int widget;
 
@@ -313,12 +313,12 @@ void tiocx_irq_free(struct sn_irq_info *sn_irq_info)
         }
 }
 
-uint64_t tiocx_dma_addr(uint64_t addr)
+u64 tiocx_dma_addr(u64 addr)
 {
         return PHYS_TO_TIODMA(addr);
 }
 
-uint64_t tiocx_swin_base(int nasid)
+u64 tiocx_swin_base(int nasid)
 {
         return TIO_SWIN_BASE(nasid, TIOCX_CORELET);
 }
@@ -335,8 +335,8 @@ EXPORT_SYMBOL(tiocx_swin_base);
 
 static void tio_conveyor_set(nasid_t nasid, int enable_flag)
 {
-        uint64_t ice_frz;
-        uint64_t disable_cb = (1ull << 61);
+        u64 ice_frz;
+        u64 disable_cb = (1ull << 61);
 
         if (!(nasid & 1))
                 return;
@@ -388,7 +388,7 @@ static int is_fpga_tio(int nasid, int *bt)
 
 static int bitstream_loaded(nasid_t nasid)
 {
-        uint64_t cx_credits;
+        u64 cx_credits;
 
         cx_credits = REMOTE_HUB_L(nasid, TIO_ICE_PMI_TX_DYN_CREDIT_STAT_CB3);
         cx_credits &= TIO_ICE_PMI_TX_DYN_CREDIT_STAT_CB3_CREDIT_CNT_MASK;
@@ -404,14 +404,14 @@ static int tiocx_reload(struct cx_dev *cx_dev)
         nasid_t nasid = cx_dev->cx_id.nasid;
 
         if (bitstream_loaded(nasid)) {
-                uint64_t cx_id;
+                u64 cx_id;
                 int rv;
 
                 rv = ia64_sn_sysctl_tio_clock_reset(nasid);
                 if (rv) {
                         printk(KERN_ALERT "CX port JTAG reset failed.\n");
                 } else {
-                        cx_id = *(volatile uint64_t *)
+                        cx_id = *(volatile u64 *)
                                 (TIO_SWIN_BASE(nasid, TIOCX_CORELET) +
                                           WIDGET_ID);
                         part_num = XWIDGET_PART_NUM(cx_id);