Skip to contentSkip to conversation

au1000: fix build failure for db1x00 configured for Au1100 SoC

PATCH In review Florian Fainelli 2 participants 3 messages Aug 16, 2009 – Oct 5, 2009 MIPS

lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

PATCH 1/2 au1000: fix build failure for db1x00 configured for Au1100 SoC

Hi Ralf,

This patch should apply to both -master and -queue. Thanks !
--
From: Florian Fainelli <[email protected]>
Subject: [PATCH 1/2] au1000: fix build failure for db1x00 configured for Au1100 SoC

This patch fixes the following warning, which becomes an error due to
-Werror to be turned on:
CC arch/mips/alchemy/common/gpiolib-au1000.o
cc1: warnings being treated as errors
arch/mips/alchemy/common/gpiolib-au1000.c: In function 'au1100_gpio2_to_irq':
/home/florian/dev/kernel/linux-queue/arch/mips/include/asm/mach-au1x00/gpio-au1000.h:107: warning: control reaches end of non-void function

Signed-off-by Florian Fainelli <[email protected]>

---

arch/mips/include/asm/mach-au1x00/gpio-au1000.h +2 -0
index 127d4ed..4d54d40 100644
@@ -104,6 +104,8 @@ static inline int au1100_gpio2_to_irq(int gpio)
 
 	if ((gpio >= 8) && (gpio <= 15))
 		return MAKE_IRQ(0, 29);		/* shared GPIO208_215 */
+
+	return -ENXIO;
 }
 
 #ifdef CONFIG_SOC_AU1100
#1 lore raw

Hi Ralf,

Please add Florian's patch below to your patchqueue!

Quoted 28 lines · Florian Fainelli

Hi Ralf,

This patch should apply to both -master and -queue. Thanks !
--
From: Florian Fainelli <[email protected]>
Subject: [PATCH 1/2] au1000: fix build failure for db1x00 configured for Au1100 SoC

This patch fixes the following warning, which becomes an error due to
-Werror to be turned on:
 CC      arch/mips/alchemy/common/gpiolib-au1000.o
cc1: warnings being treated as errors
arch/mips/alchemy/common/gpiolib-au1000.c: In function 'au1100_gpio2_to_irq':
/home/florian/dev/kernel/linux-queue/arch/mips/include/asm/mach-au1x00/gpio-au1000.h:107: warning: control reaches end of non-void function

Signed-off-by Florian Fainelli <[email protected]>

---

arch/mips/include/asm/mach-au1x00/gpio-au1000.h +0 -0
index 127d4ed..4d54d40 100644
@@ -104,6 +104,8 @@ static inline int au1100_gpio2_to_irq(int gpio)
 
        if ((gpio >= 8) && (gpio <= 15))

               return MAKE_IRQ(0, 29);         /* shared GPIO208_215 */ +
+       return -ENXIO;
 }

Quoted 1 line

 #ifdef CONFIG_SOC_AU1100

Thanks!

Manuel Lauss

#2 lore raw

Ping?

Quoted 34 lines · Manuel Lauss

Hi Ralf,

Please add Florian's patch below to your patchqueue!

Quoted 29 lines · Florian Fainelli

Hi Ralf,

This patch should apply to both -master and -queue. Thanks !
--
From: Florian Fainelli <[email protected]>
Subject: [PATCH 1/2] au1000: fix build failure for db1x00 configured for Au1100 SoC

This patch fixes the following warning, which becomes an error due to
-Werror to be turned on:
 CC      arch/mips/alchemy/common/gpiolib-au1000.o
cc1: warnings being treated as errors
arch/mips/alchemy/common/gpiolib-au1000.c: In function 'au1100_gpio2_to_irq':
/home/florian/dev/kernel/linux-queue/arch/mips/include/asm/mach-au1x00/gpio-au1000.h:107: warning: control reaches end of non-void function

Signed-off-by Florian Fainelli <[email protected]>

---

arch/mips/include/asm/mach-au1x00/gpio-au1000.h +0 -0
index 127d4ed..4d54d40 100644
@@ -104,6 +104,8 @@ static inline int au1100_gpio2_to_irq(int gpio)
 
        if ((gpio >= 8) && (gpio <= 15))

               return MAKE_IRQ(0, 29);         /* shared GPIO208_215 */ +
+       return -ENXIO;
 }

 #ifdef CONFIG_SOC_AU1100