Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9010eff0 authored by Jeff Garzik's avatar Jeff Garzik Committed by Tony Luck
Browse files

[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: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 4fa2f0e6

arch/ia64/kernel/perfmon.c

+2 −2
Original line number Diff line number Diff line
@@ -5511,7 +5511,7 @@ stop_monitoring: 
}



static int

pfm_do_interrupt_handler(int irq, void *arg, struct pt_regs *regs)

pfm_do_interrupt_handler(void *arg, struct pt_regs *regs)

{

	struct task_struct *task;

	pfm_context_t *ctx;
@@ -5591,7 +5591,7 @@ pfm_interrupt_handler(int irq, void *arg) 


		start_cycles = ia64_get_itc();



		ret = pfm_do_interrupt_handler(irq, arg, regs);

		ret = pfm_do_interrupt_handler(arg, regs);



		total_cycles = ia64_get_itc();

arch/ia64/sn/kernel/huberror.c

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ void hub_error_init(struct hubdev_info *hubdev_info) 
{



	if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,

			"SN_hub_error", (void *)hubdev_info)) {

		printk("hub_error_init: Failed to request_irq for 0x%p\n",

			"SN_hub_error", hubdev_info)) {

		printk(KERN_ERR "hub_error_init: Failed to request_irq for 0x%p\n",

		    hubdev_info);

		return;

	}

arch/ia64/sn/pci/tioce_provider.c

+4 −2
Original line number Diff line number Diff line
@@ -655,7 +655,8 @@ tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) 
 *

 * Simply call tioce_do_dma_map() to create a map with the barrier bit set

 * in the address.

 */ static u64

 */

static u64

tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)

{

	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 
 *

 * Handle a CE error interrupt.  Simply a wrapper around a SAL call which

 * defers processing to the SGI prom.

 */ static irqreturn_t

 */

static irqreturn_t

tioce_error_intr_handler(int irq, void *arg)

{

	struct tioce_common *soft = arg;