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

Commit 6132f9e1 authored by David Vrabel's avatar David Vrabel Committed by Russell King
Browse files

[ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type 



Patch from David Vrabel

Signed-off-by: default avatarDavid Vrabel <dvrabel@arcom.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cbf8fd9f

arch/arm/mach-ixp4xx/common.c

+4 −1
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) 
	} else if (type & IRQT_LOW) {

		int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;

		irq_type = IXP4XX_IRQ_LEVEL;

	}

	} else

		return -EINVAL;



	ixp4xx_config_irq(irq, irq_type);
@@ -142,6 +143,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) 


	/* Set the new style */

	*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));



	return 0;

}



static void ixp4xx_irq_mask(unsigned int irq)