diff options
| author | Prarit Bhargava <prarit@sgi.com> | 2005-05-10 15:40:00 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-28 12:50:48 -0400 |
| commit | 92a582ed2757456ca9599f8b4ea2064f2154eb02 (patch) | |
| tree | 2ab8746b660fd06ea71743dd2a4d9fbe9fcf887f | |
| parent | 71030994a77e7689a7a792128b131ef7a10b9f74 (diff) | |
[IA64] sparse cleanup of TIOCA files
This patch is a sparse compile cleanup of tioca_provider.c, sn_hwperf.h, and
tioca_provider.h. Each of these files had sparse warnings when
compiled.
Signed-off-by: Prarit Bhargava <prarit@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 8 | ||||
| -rw-r--r-- | include/asm-ia64/sn/sn2/sn_hwperf.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/sn/tioca_provider.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 8dae9eb45456..05aa8c2fe9bb 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
| @@ -336,7 +336,7 @@ tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr) | |||
| 336 | if (!ct_addr) | 336 | if (!ct_addr) |
| 337 | return 0; | 337 | return 0; |
| 338 | 338 | ||
| 339 | bus_addr = (dma_addr_t) (ct_addr & 0xffffffffffff); | 339 | bus_addr = (dma_addr_t) (ct_addr & 0xffffffffffffUL); |
| 340 | node_upper = ct_addr >> 48; | 340 | node_upper = ct_addr >> 48; |
| 341 | 341 | ||
| 342 | if (node_upper > 64) { | 342 | if (node_upper > 64) { |
| @@ -464,7 +464,7 @@ map_return: | |||
| 464 | * For mappings created using the direct modes (64 or 48) there are no | 464 | * For mappings created using the direct modes (64 or 48) there are no |
| 465 | * resources to release. | 465 | * resources to release. |
| 466 | */ | 466 | */ |
| 467 | void | 467 | static void |
| 468 | tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) | 468 | tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) |
| 469 | { | 469 | { |
| 470 | int i, entry; | 470 | int i, entry; |
| @@ -514,7 +514,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) | |||
| 514 | * The mapping mode used is based on the devices dma_mask. As a last resort | 514 | * The mapping mode used is based on the devices dma_mask. As a last resort |
| 515 | * use the GART mapped mode. | 515 | * use the GART mapped mode. |
| 516 | */ | 516 | */ |
| 517 | uint64_t | 517 | static uint64_t |
| 518 | tioca_dma_map(struct pci_dev *pdev, uint64_t paddr, size_t byte_count) | 518 | tioca_dma_map(struct pci_dev *pdev, uint64_t paddr, size_t byte_count) |
| 519 | { | 519 | { |
| 520 | uint64_t mapaddr; | 520 | uint64_t mapaddr; |
| @@ -580,7 +580,7 @@ tioca_error_intr_handler(int irq, void *arg, struct pt_regs *pt) | |||
| 580 | * On successful setup, returns the kernel version of tioca_common back to | 580 | * On successful setup, returns the kernel version of tioca_common back to |
| 581 | * the caller. | 581 | * the caller. |
| 582 | */ | 582 | */ |
| 583 | void * | 583 | static void * |
| 584 | tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft) | 584 | tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft) |
| 585 | { | 585 | { |
| 586 | struct tioca_common *tioca_common; | 586 | struct tioca_common *tioca_common; |
diff --git a/include/asm-ia64/sn/sn2/sn_hwperf.h b/include/asm-ia64/sn/sn2/sn_hwperf.h index b0c4d6dd77ba..df75f4c4aec3 100644 --- a/include/asm-ia64/sn/sn2/sn_hwperf.h +++ b/include/asm-ia64/sn/sn2/sn_hwperf.h | |||
| @@ -223,4 +223,6 @@ struct sn_hwperf_ioctl_args { | |||
| 223 | #define SN_HWPERF_OP_RECONFIGURE 253 | 223 | #define SN_HWPERF_OP_RECONFIGURE 253 |
| 224 | #define SN_HWPERF_OP_INVAL 254 | 224 | #define SN_HWPERF_OP_INVAL 254 |
| 225 | 225 | ||
| 226 | int sn_topology_open(struct inode *inode, struct file *file); | ||
| 227 | int sn_topology_release(struct inode *inode, struct file *file); | ||
| 226 | #endif /* SN_HWPERF_H */ | 228 | #endif /* SN_HWPERF_H */ |
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h index b6acc22ab239..5ccec608d325 100644 --- a/include/asm-ia64/sn/tioca_provider.h +++ b/include/asm-ia64/sn/tioca_provider.h | |||
| @@ -201,6 +201,7 @@ tioca_tlbflush(struct tioca_kernel *tioca_kernel) | |||
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | extern uint32_t tioca_gart_found; | 203 | extern uint32_t tioca_gart_found; |
| 204 | extern struct list_head tioca_list; | ||
| 204 | extern int tioca_init_provider(void); | 205 | extern int tioca_init_provider(void); |
| 205 | extern void tioca_fastwrite_enable(struct tioca_kernel *tioca_kern); | 206 | extern void tioca_fastwrite_enable(struct tioca_kernel *tioca_kern); |
| 206 | #endif /* _ASM_IA64_SN_TIO_CA_AGP_PROVIDER_H */ | 207 | #endif /* _ASM_IA64_SN_TIO_CA_AGP_PROVIDER_H */ |
