diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-04-18 19:22:58 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-04-22 11:56:58 -0400 |
commit | 9010eff0eadfe4eb60c3f0c71573f0fc505c31e3 (patch) | |
tree | d4c6b2f81f6677bf0e457089e5bdd7449070d666 /arch/ia64/sn | |
parent | 4fa2f0e672ba16b55a34ecfa514ccd92e226d3d4 (diff) |
[IA64] minor irq handler cleanups
- remove unused 'irq' argument from pfm_do_interrupt_handler()
- remove pointless cast to void*
- add KERN_xxx prefix to printk()
- remove braces around singleton C statement
- in tioce_provider.c, start tioce_dma_consistent() and
tioce_error_intr_handler() function declarations in column 0
This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/huberror.c | 4 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c index 0101c7924a4d..08b0d9bb62ec 100644 --- a/arch/ia64/sn/kernel/huberror.c +++ b/arch/ia64/sn/kernel/huberror.c | |||
@@ -187,8 +187,8 @@ void hub_error_init(struct hubdev_info *hubdev_info) | |||
187 | { | 187 | { |
188 | 188 | ||
189 | if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED, | 189 | if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED, |
190 | "SN_hub_error", (void *)hubdev_info)) { | 190 | "SN_hub_error", hubdev_info)) { |
191 | printk("hub_error_init: Failed to request_irq for 0x%p\n", | 191 | printk(KERN_ERR "hub_error_init: Failed to request_irq for 0x%p\n", |
192 | hubdev_info); | 192 | hubdev_info); |
193 | return; | 193 | return; |
194 | } | 194 | } |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 9b3c11373022..94e584527f48 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
@@ -655,7 +655,8 @@ tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) | |||
655 | * | 655 | * |
656 | * Simply call tioce_do_dma_map() to create a map with the barrier bit set | 656 | * Simply call tioce_do_dma_map() to create a map with the barrier bit set |
657 | * in the address. | 657 | * in the address. |
658 | */ static u64 | 658 | */ |
659 | static u64 | ||
659 | tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) | 660 | tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) |
660 | { | 661 | { |
661 | return tioce_do_dma_map(pdev, paddr, byte_count, 1, dma_flags); | 662 | return tioce_do_dma_map(pdev, paddr, byte_count, 1, dma_flags); |
@@ -668,7 +669,8 @@ tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma | |||
668 | * | 669 | * |
669 | * Handle a CE error interrupt. Simply a wrapper around a SAL call which | 670 | * Handle a CE error interrupt. Simply a wrapper around a SAL call which |
670 | * defers processing to the SGI prom. | 671 | * defers processing to the SGI prom. |
671 | */ static irqreturn_t | 672 | */ |
673 | static irqreturn_t | ||
672 | tioce_error_intr_handler(int irq, void *arg) | 674 | tioce_error_intr_handler(int irq, void *arg) |
673 | { | 675 | { |
674 | struct tioce_common *soft = arg; | 676 | struct tioce_common *soft = arg; |