: ia64/sn Remove all [u]intX_t declarations
PATCH 2/2 : ia64/sn Remove all [u]intX_t declarations
Cleanup of arch/ia64/sn
Replace uintX_t declarations with uX.
Replace intX_t declarations with sX.
---
commit 2e86742f8755754f9bdf2a8295fcc65b14f24566
tree 0e1711233980bb3d22415b569b135995c297c540
parent 87530db5ec7d519c7ba334e414307c5130ae2da8
author prarit <[email protected]> Sat, 14 Jan 2006 14:41:05 -0500 committer prarit <[email protected]> Sat, 14 Jan 2006 14:41:05 -0500
arch/ia64/sn/include/xtalk/hubdev.h | 10 ++- arch/ia64/sn/include/xtalk/xbow.h | 94 ++++++++++++++++--------------- arch/ia64/sn/include/xtalk/xwidgetdev.h | 46 ++++++++------- arch/ia64/sn/kernel/io_init.c | 20 +++---- arch/ia64/sn/kernel/irq.c | 10 ++- arch/ia64/sn/kernel/tiocx.c | 18 +++--- arch/ia64/sn/pci/pcibr/pcibr_ate.c | 16 +++-- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 44 +++++++-------- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 12 ++-- arch/ia64/sn/pci/pcibr/pcibr_reg.c | 28 +++++---- arch/ia64/sn/pci/tioca_provider.c | 36 ++++++------ arch/ia64/sn/pci/tioce_provider.c | 68 +++++++++++----------- 12 files changed, 201 insertions(+), 201 deletions(-)
arch/ia64/sn/include/xtalk/hubdev.h +5 -5
@@ -37,8 +37,8 @@ struct sn_flush_device_list {unsigned long sfdl_force_int_addr;unsigned long sfdl_flush_value;volatile unsigned long *sfdl_flush_addr; -uint32_t sfdl_persistent_busnum; -uint32_t sfdl_persistent_segment; +u32 sfdl_persistent_busnum; +u32 sfdl_persistent_segment;struct pcibus_info *sfdl_pcibus_info;spinlock_t sfdl_flush_lock; };
@@ -48,7 +48,7 @@ struct sn_flush_device_list {*/ struct sn_flush_nasid_entry {struct sn_flush_device_list **widget_p;/* Used as a array of wid_num */ -uint64_t iio_itte[8 ]; +u64 iio_itte[8 ]; };struct hubdev_info {
@@ -62,8 +62,8 @@ struct hubdev_info {void *hdi_nodepda;void *hdi_node_vertex; -uint32_t max_segment_number; -uint32_t max_pcibus_number; +u32 max_segment_number; +u32 max_pcibus_number; };extern void hubdev_init_node (nodepda_t *,cnodeid_t );
arch/ia64/sn/include/xtalk/xbow.h +47 -47
109 lines not on this page · raw message
arch/ia64/sn/include/xtalk/xwidgetdev.h +23 -23
58 lines not on this page · raw message
arch/ia64/sn/kernel/io_init.c +10 -10
@@ -79,7 +79,7 @@ static struct sn_pcibus_provider sn_pci_* Retrieve the DMA Flush List given nasid. This list is needed * to implement the WAR - Flush DMA data on PIO Reads. */ -static inline uint64_t +static inline u64 sal_get_widget_dmaflush_list (u64 nasid,u64 widget_num,u64 address) {
@@ -98,7 +98,7 @@ sal_get_widget_dmaflush_list(u64 nasid,/* * Retrieve the hub device info structure for the given nasid. */ -static inline uint64_t sal_get_hubdev_info (u64 handle,u64 address) +static inline u64 sal_get_hubdev_info (u64 handle,u64 address) {struct ia64_sal_retval ret_stuff;
@@ -114,7 +114,7 @@ static inline uint64_t sal_get_hubdev_in/* * Retrieve the pci bus information given the bus number. */ -static inline uint64_t sal_get_pcibus_info (u64 segment,u64 busnum,u64 address) +static inline u64 sal_get_pcibus_info (u64 segment,u64 busnum,u64 address) {struct ia64_sal_retval ret_stuff;
@@ -130,7 +130,7 @@ static inline uint64_t sal_get_pcibus_in/* * Retrieve the pci device information given the bus and device|function number. */ -static inline uint64_t +static inline u64 sal_get_pcidev_info (u64 segment,u64 bus_number,u64 devfn,u64 pci_dev,u64 sn_irq_info) {
@@ -173,8 +173,8 @@ static void sn_fixup_ionodes(void)struct sn_flush_device_list *sn_flush_device_list;struct hubdev_info *hubdev; -uint64_t status; -uint64_t nasid; +u64 status; +u64 nasid;int i, widget;/*
@@ -186,7 +186,7 @@ static void sn_fixup_ionodes(void) nasid =cnodeid_to_nasid (i); hubdev->max_segment_number =0xffffffff ; hubdev->max_pcibus_number =0xff ; - status =sal_get_hubdev_info (nasid, (uint64_t )__pa (hubdev)); + status =sal_get_hubdev_info (nasid, (u64 )__pa (hubdev));if (status)continue ;
@@ -230,7 +230,7 @@ static void sn_fixup_ionodes(void) status sal_get_widget_dmaflush_list(nasid, widget, - (uint64_t ) + (u64) __pa (sn_flush_device_list)); if (status) {
@@ -256,7 +256,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;
@@ -316,7 +316,7 @@ void sn_pci_fixup_slot(struct pci_dev *dstruct 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;
arch/ia64/sn/kernel/irq.c +5 -5
@@ -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(unsignedlist_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(unsignedbreak ;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;
arch/ia64/sn/kernel/tiocx.c +9 -9
@@ -245,7 +245,7 @@ static int cx_device_reload(struct cx_de 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(nasivoid 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 * } } -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 *bstatic 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 *cnasid_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);
arch/ia64/sn/pci/pcibr/pcibr_ate.c +8 -8
@@ -18,10 +18,10 @@ int pcibr_invalidate_ate = 0; /* by defa* mark_ate: Mark the ate as either free or inuse. */ static void mark_ate (struct ate_resource *ate_resource,int start,int number, -uint64_t value) +u64 value) { -uint64_t *ate = ate_resource->ate; +u64 *ate = ate_resource->ate;int index;int length =0 ;
@@ -38,7 +38,7 @@ static int find_free_ate(struct ate_reso int count) { -uint64_t *ate = ate_resource->ate; +u64 *ate = ate_resource->ate;int index;int start_free;
@@ -119,7 +119,7 @@ static inline int alloc_ate_resource(strint pcibr_ate_alloc (struct pcibus_info *pcibus_info,int count) {int status =0 ; -uint64_t flag; +u64 flag; flag =pcibr_lock (pcibus_info); status =alloc_ate_resource (&pcibus_info->pbi_int_ate_resource, count);
@@ -139,7 +139,7 @@ int pcibr_ate_alloc(struct pcibus_info ** Setup an Address Translation Entry as specified. Use either the Bridge * internal maps or the external map RAM, as appropriate. */ -static inline uint64_t *pcibr_ate_addr (struct pcibus_info *pcibus_info, +static inline u64 *pcibr_ate_addr (struct pcibus_info *pcibus_info,int ate_index) {if (ate_index < pcibus_info->pbi_int_ate_size) {
@@ -153,7 +153,7 @@ static inline uint64_t *pcibr_ate_addr(s*/ void inline ate_write (struct pcibus_info *pcibus_info,int ate_index,int count, -volatile uint64_t ate) +volatile u64 ate) {while (count-- >0 ) {if (ate_index < pcibus_info->pbi_int_ate_size) {
@@ -171,9 +171,9 @@ ate_write(struct pcibus_info *pcibus_infvoid pcibr_ate_free (struct pcibus_info *pcibus_info,int index) { -volatile uint64_t ate; +volatile u64 ate;int count; -uint64_t flags; +u64 flags;if (pcibr_invalidate_ate) {/* For debugging purposes, clear the valid bit in the ATE */
arch/ia64/sn/pci/pcibr/pcibr_dma.c +22 -21
107 lines not on this page · raw message
arch/ia64/sn/pci/pcibr/pcibr_provider.c +6 -5
@@ -23,7 +23,7 @@ int sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp) { struct ia64_sal_retval ret_stuff; -uint64_t busnum; +u64 busnum; ret_stuff.status =0 ; ret_stuff.v0 =0 ;
@@ -40,7 +40,7 @@ sal_pcibr_slot_disable(struct pcibus_inf void *resp) {struct ia64_sal_retval ret_stuff; -uint64_t busnum; +u64 busnum; ret_stuff.status =0 ; ret_stuff.v0 =0 ;
@@ -56,7 +56,7 @@ sal_pcibr_slot_disable(struct pcibus_infstatic int sal_pcibr_error_interrupt (struct pcibus_info *soft) {struct ia64_sal_retval ret_stuff; -uint64_t busnum; +u64 busnum;int segment; ret_stuff.status =0 ; ret_stuff.v0 =0 ;
@@ -159,9 +159,9 @@ pcibr_bus_fixup(struct pcibus_bussoft *p/* Setup the PMU ATE map */ soft->pbi_int_ate_resource.lowest_free_index =0 ; soft->pbi_int_ate_resource.ate -kmalloc (soft->pbi_int_ate_size *sizeof (uint64_t ),GFP_KERNEL ); +kmalloc (soft->pbi_int_ate_size *sizeof (u64),GFP_KERNEL );memset (soft->pbi_int_ate_resource.ate,0 , - (soft->pbi_int_ate_size *sizeof (uint64_t ))); + (soft->pbi_int_ate_size *sizeof (u64)));if (prom_bussoft->bs_asic_type =PCIIO_ASIC_TYPE_TIOCP ) {/* TIO PCI Bridge: find nearest node with CPUs */
@@ -203,7 +203,7 @@ void pcibr_target_interrupt(struct sn_irstruct pcidev_info *pcidev_info;struct pcibus_info *pcibus_info;int bit = sn_irq_info->irq_int_bit; -uint64_t xtalk_addr = sn_irq_info->irq_xtalkaddr; +u64 xtalk_addr = sn_irq_info->irq_xtalkaddr; pcidev_info = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;if (pcidev_info) {
arch/ia64/sn/pci/pcibr/pcibr_reg.c +14 -14
@@ -23,7 +23,7 @@ union br_ptr {/* * Control Register Access -- Read/Write 0000_0020 */ -void pcireg_control_bit_clr (struct pcibus_info *pcibus_info,uint64_t bits) +void pcireg_control_bit_clr (struct pcibus_info *pcibus_info,u64 bits) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -43,7 +43,7 @@ void pcireg_control_bit_clr(struct pcibu } } -void pcireg_control_bit_set (struct pcibus_info *pcibus_info,uint64_t bits) +void pcireg_control_bit_set (struct pcibus_info *pcibus_info,u64 bits) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -66,10 +66,10 @@ void pcireg_control_bit_set(struct pcibu/* * PCI/PCIX Target Flush Register Access -- Read Only 0000_0050 */ -uint64_t pcireg_tflush_get (struct pcibus_info *pcibus_info) +u64 pcireg_tflush_get (struct pcibus_info *pcibus_info) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; -uint64_t ret =0 ; +u64 ret =0 ;if (pcibus_info) {switch (pcibus_info->pbi_bridge_type) {
@@ -96,10 +96,10 @@ uint64_t pcireg_tflush_get(struct pcibus/* * Interrupt Status Register Access -- Read Only 0000_0100 */ -uint64_t pcireg_intr_status_get (struct pcibus_info * pcibus_info) +u64 pcireg_intr_status_get (struct pcibus_info * pcibus_info) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; -uint64_t ret =0 ; +u64 ret =0 ;if (pcibus_info) {switch (pcibus_info->pbi_bridge_type) {
@@ -121,7 +121,7 @@ uint64_t pcireg_intr_status_get(struct p/* * Interrupt Enable Register Access -- Read/Write 0000_0108 */ -void pcireg_intr_enable_bit_clr (struct pcibus_info *pcibus_info,uint64_t bits) +void pcireg_intr_enable_bit_clr (struct pcibus_info *pcibus_info,u64 bits) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -141,7 +141,7 @@ void pcireg_intr_enable_bit_clr(struct p } } -void pcireg_intr_enable_bit_set (struct pcibus_info *pcibus_info,uint64_t bits) +void pcireg_intr_enable_bit_set (struct pcibus_info *pcibus_info,u64 bits) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -165,7 +165,7 @@ void pcireg_intr_enable_bit_set(struct p* Intr Host Address Register (int_addr) -- Read/Write 0000_0130 - 0000_0168 */ void pcireg_intr_addr_addr_set (struct pcibus_info *pcibus_info,int int_n, -uint64_t addr) +u64 addr) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -217,10 +217,10 @@ void pcireg_force_intr_set(struct pcibus/* * Device(x) Write Buffer Flush Reg Access -- Read Only 0000_0240 - 0000_0258 */ -uint64_t pcireg_wrb_flush_get (struct pcibus_info *pcibus_info,int device) +u64 pcireg_wrb_flush_get (struct pcibus_info *pcibus_info,int device) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; -uint64_t ret =0 ; +u64 ret =0 ;if (pcibus_info) {switch (pcibus_info->pbi_bridge_type) {
@@ -242,7 +242,7 @@ uint64_t pcireg_wrb_flush_get(struct pci }void pcireg_int_ate_set (struct pcibus_info *pcibus_info,int ate_index, -uint64_t val) +u64 val) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
@@ -262,10 +262,10 @@ void pcireg_int_ate_set(struct pcibus_in } } -uint64_t __iomem *pcireg_int_ate_addr (struct pcibus_info *pcibus_info,int ate_index) +u64 __iomem *pcireg_int_ate_addr (struct pcibus_info *pcibus_info,int ate_index) {union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; -uint64_t __iomem *ret =NULL ; +u64 __iomem *ret =NULL ;if (pcibus_info) {switch (pcibus_info->pbi_bridge_type) {
arch/ia64/sn/pci/tioca_provider.c +18 -18
@@ -16,7 +16,7 @@#include <asm/sn/pcibus_provider_defs.h> #include <asm/sn/tioca_provider.h> -uint32_t tioca_gart_found; +u32 tioca_gart_found;EXPORT_SYMBOL (tioca_gart_found);/* used by agp-sgi */ LIST_HEAD (tioca_list);
@@ -34,8 +34,8 @@ static int tioca_gart_init(struct tioca_static int tioca_gart_init (struct tioca_kernel *tioca_kern) { -uint64_t ap_reg; -uint64_t offset; +u64 ap_reg; +u64 offset;struct page *tmp;struct tioca_common *tioca_common;struct tioca __iomem *ca_base;
@@ -214,7 +214,7 @@ void tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) {int cap_ptr; -uint32_t reg; +u32 reg;struct tioca __iomem *tioca_base;struct pci_dev *pdev;struct tioca_common *common;
@@ -276,7 +276,7 @@ EXPORT_SYMBOL(tioca_fastwrite_enable); /* We will always use 0x1 * 55:55 - Swap bytes Currently unused */ -static uint64_t +static u64 tioca_dma_d64 (unsigned long paddr) {dma_addr_t bus_addr;
@@ -318,15 +318,15 @@ tioca_dma_d64(unsigned long paddr)* and so a given CA can only directly target nodes in the range * xxx - xxx+255. */ -static uint64_t -tioca_dma_d48 (struct pci_dev *pdev,uint64_t paddr) +static u64 +tioca_dma_d48 (struct pci_dev *pdev,u64 paddr) {struct tioca_common *tioca_common;struct tioca __iomem *ca_base; -uint64_t ct_addr; +u64 ct_addr;dma_addr_t bus_addr; -uint32_t node_upper; -uint64_t agp_dma_extn; +u32 node_upper; +u64 agp_dma_extn;struct pcidev_info *pcidev_info =SN_PCIDEV_INFO (pdev); tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info;
@@ -367,10 +367,10 @@ tioca_dma_d48(struct pci_dev *pdev, uint* dma_addr_t is guarenteed to be contiguous in CA bus space. */ static dma_addr_t -tioca_dma_mapped (struct pci_dev *pdev,uint64_t paddr,size_t req_size) +tioca_dma_mapped (struct pci_dev *pdev,u64 paddr,size_t req_size) {int i, ps, ps_shift, entry, entries, mapsize, last_entry; -uint64_t xio_addr, end_xio_addr; +u64 xio_addr, end_xio_addr;struct tioca_common *tioca_common;struct tioca_kernel *tioca_kern;dma_addr_t bus_addr =0 ;
@@ -514,10 +514,10 @@ tioca_dma_unmap(struct pci_dev *pdev, dm* The mapping mode used is based on the devices dma_mask. As a last resort * use the GART mapped mode. */ -static uint64_t -tioca_dma_map (struct pci_dev *pdev,uint64_t paddr,size_t byte_count) +static u64 +tioca_dma_map (struct pci_dev *pdev,u64 paddr,size_t byte_count) { -uint64_t mapaddr; +u64 mapaddr;/* * If card is 64 or 48 bit addresable, use a direct mapping. 32
@@ -554,8 +554,8 @@ tioca_error_intr_handler(int irq, void * {struct tioca_common *soft = arg;struct ia64_sal_retval ret_stuff; -uint64_t segment; -uint64_t busnum; +u64 segment; +u64 busnum; ret_stuff.status =0 ; ret_stuff.v0 =0 ;
@@ -620,7 +620,7 @@ tioca_bus_fixup(struct pcibus_bussoft *pINIT_LIST_HEAD (&tioca_kern->ca_dmamaps); tioca_kern->ca_closest_node nasid_to_cnodeid(tioca_common->ca_closest_nasid); - tioca_common->ca_kernel_private = (uint64_t ) tioca_kern; + tioca_common->ca_kernel_private = (u64 ) tioca_kern; bus =pci_find_bus (tioca_common->ca_common.bs_persist_segment, tioca_common->ca_common.bs_persist_busnum);
arch/ia64/sn/pci/tioce_provider.c +34 -34
192 lines not on this page · raw message
Quoted 4 lines · Prarit Bhargava
Cleanup of
arch/ia64/snReplace
uintX_tdeclarations with uX.
ReplaceintX_tdeclarations with sX.
Hmm looks like Part 1 disappeared into oblivion.
Tony -- let me try once more. :/
P.