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

Commit a23b7cb9 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] more ia64 irq handlers 



Cast to (void *) in request_irq() argument is stupid and
only hides problems...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 041a6bae

arch/ia64/sn/kernel/huberror.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
void hubiio_crb_error_handler(struct hubdev_info *hubdev_info);

extern void bte_crb_error_handler(cnodeid_t, int, int, ioerror_t *,

				  int);

static irqreturn_t hub_eint_handler(int irq, void *arg, struct pt_regs *ep)

static irqreturn_t hub_eint_handler(int irq, void *arg)

{

	struct hubdev_info *hubdev_info;

	struct ia64_sal_retval ret_stuff;
@@ -178,7 +178,7 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info) 
 */

void hub_error_init(struct hubdev_info *hubdev_info)

{

	if (request_irq(SGI_II_ERROR, (void *)hub_eint_handler, IRQF_SHARED,

	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",

		    hubdev_info);

arch/ia64/sn/pci/pcibr/pcibr_provider.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus) 
 * bridge sends an error interrupt.

 */

static irqreturn_t

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

pcibr_error_intr_handler(int irq, void *arg)

{

	struct pcibus_info *soft = (struct pcibus_info *)arg;
@@ -138,7 +138,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont 
	/*

	 * register the bridge's error interrupt handler

	 */

	if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler,

	if (request_irq(SGI_PCIASIC_ERROR, pcibr_error_intr_handler,

			IRQF_SHARED, "PCIBR error", (void *)(soft))) {

		printk(KERN_WARNING

		       "pcibr cannot allocate interrupt for error handler\n");