Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752510AbbBMIhO (ORCPT ); Fri, 13 Feb 2015 03:37:14 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:40663 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752137AbbBMIhM (ORCPT ); Fri, 13 Feb 2015 03:37:12 -0500 Message-ID: <54DDB7B1.2020800@atmel.com> Date: Fri, 13 Feb 2015 09:37:05 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Arnd Bergmann , CC: , , "Jean-Christophe Plagniol-Villard" , Alexandre Belloni Subject: Re: [PATCH 06/11] ARM: at91: fix pm declarations References: <1423770163-583064-1-git-send-email-arnd@arndb.de> <1423770163-583064-7-git-send-email-arnd@arndb.de> In-Reply-To: <1423770163-583064-7-git-send-email-arnd@arndb.de> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2625 Lines: 63 Le 12/02/2015 20:42, Arnd Bergmann a ?crit : > In a recent rearrangement of the at91 pm initialization code, a broken > set of declarations was added for the !CONFIG_PM-case, leading to > this link error: > > arch/arm/mach-at91/board-dt-sama5.o: In function `at91_rm9200_pm_init': > arch/arm/mach-at91/generic.h:40: multiple definition of `at91_rm9200_pm_init' > arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:40: first defined here > arch/arm/mach-at91/board-dt-sama5.o: In function `at91_sam9260_pm_init': > arch/arm/mach-at91/generic.h:41: multiple definition of `at91_sam9260_pm_init' > arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:41: first defined here > arch/arm/mach-at91/board-dt-sama5.o: In function `at91_sam9g45_pm_init': > arch/arm/mach-at91/generic.h:42: multiple definition of `at91_sam9g45_pm_init' > arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:42: first defined here > > This adds the missing 'static inline' to the declarations to avoid > creating a copy of the functions in each file that includes the > header. > > Signed-off-by: Arnd Bergmann > Fixes: 4db0ba22da9 ("ARM: at91: pm: prepare for multiplatform") > Cc: Nicolas Ferre Yes: Acked-by: Nicolas Ferre Thanks Arnd. Bye, > Cc: Jean-Christophe Plagniol-Villard > Cc: Alexandre Belloni > --- > arch/arm/mach-at91/generic.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h > index a6e726a6e0b5..583369ffc284 100644 > --- a/arch/arm/mach-at91/generic.h > +++ b/arch/arm/mach-at91/generic.h > @@ -35,10 +35,10 @@ extern void __init at91sam9260_pm_init(void); > extern void __init at91sam9g45_pm_init(void); > extern void __init at91sam9x5_pm_init(void); > #else > -void __init at91rm9200_pm_init(void) { } > -void __init at91sam9260_pm_init(void) { } > -void __init at91sam9g45_pm_init(void) { } > -void __init at91sam9x5_pm_init(void) { } > +static inline void __init at91rm9200_pm_init(void) { } > +static inline void __init at91sam9260_pm_init(void) { } > +static inline void __init at91sam9g45_pm_init(void) { } > +static inline void __init at91sam9x5_pm_init(void) { } > #endif > > #endif /* _AT91_GENERIC_H */ > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/