From: David Vrabel <dvrabel@arcom.com>
Date: Mon, 26 Sep 2005 18:52:56 +0000 (+0100)
Subject: [ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6132f9e146150473f803323dc8064a5506e33952;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Patch from David Vrabel

Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 52ad11328e96..36b6045213ee 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -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)