From patchwork Tue Oct 14 09:17:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5079241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A0F4BC11AC for ; Tue, 14 Oct 2014 09:21:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4F3320138 for ; Tue, 14 Oct 2014 09:21:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2C4120136 for ; Tue, 14 Oct 2014 09:21:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdyFs-000232-6U; Tue, 14 Oct 2014 09:18:56 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdyFR-0001dW-US for linux-arm-kernel@lists.infradead.org; Tue, 14 Oct 2014 09:18:31 +0000 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue103) with ESMTP (Nemesis) id 0M35gF-1YUI2M30vH-00sxIm; Tue, 14 Oct 2014 11:17:34 +0200 From: Arnd Bergmann To: Mika Westerberg Subject: Re: next build: 304 warnings 0 failures (next/next-20141013) Date: Tue, 14 Oct 2014 11:17:33 +0200 Message-ID: <7136705.nXM3eChrM0@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20141014085432.GC2255@lahna.fi.intel.com> References: <543b63d2.a479420a.486e.ffffb6e2@mx.google.com> <8786463.d9VIC5J1Iz@wuerfel> <20141014085432.GC2255@lahna.fi.intel.com> MIME-Version: 1.0 X-Provags-ID: V02:K0:Gu0GpNSCEOBC56RGTiHhx2RIVE1cNk9FEj8RhZbtF4T /rgn50Kp0QjQq7dpVkz7t+4jKrL78vtZB4Mw89eqUvpmm2Zky6 TKbdkYErWVDQ0mOmJ59O1zQ/jsky6pZIMPSElcfk5DaORBnzf5 jnmGS5fKmCC85MFKl2vWXsoJqmjCL8xfJvfE1nn23+XIL+3A/1 eSTkxkE/W31nzncY6B4FOtg+nedpKZHshOFwUZPdL0z4inidar dkCqL96VQcxtVGxDLDOiLScBxsRJtyT01YCn8uNrdZfezUhloS VTe/8r6V8tIajsGIVi8aRG19xsSFggpuquMxp2xF3dFDV3Z3Kp H4yZAh7fk4bctIR1pcfI= X-UI-Out-Filterresults: notjunk:1; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141014_021830_429223_FD38951D X-CRM114-Status: GOOD ( 20.40 ) X-Spam-Score: -0.3 (/) Cc: Stephen Rothwell , Russell King - ARM Linux , linus.walleij@linaro.org, "Rafael J. Wysocki" , olof@lixom.net, Marek Szyprowski , linux-arm-kernel@lists.infradead.org, Olof's autobuilder X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tuesday 14 October 2014 11:54:32 Mika Westerberg wrote: > > Fenghua's build bot noticed this some time ago and it got fixed but > looks like we forgot to merge the fix to the _DSD patch series. > > Here it is again. Rafael, do you want to take this on top of the > 'device-properties' -branch? > > From: Mika Westerberg > Subject: [PATCH] leds: Move gpiod to be last member of struct gpio_led > > Commit 8b0d4dc3d44 (leds: leds-gpio: Add support for GPIO descriptors) > added a new member 'gpiod' to struct gpio_led to support GPIO descriptors. > This is fine as long as board files use designated initializers but some > fail to do so causing following build errors: > > arch/arm/mach-omap1/board-htcherald.c:296:2: warning: initialization makes pointer from integer without a cast [enabled by default] > arch/arm/mach-omap1/board-htcherald.c:296:2: warning: (near initialization for 'gpio_leds[0].gpiod') [enabled by default] > arch/arm/mach-omap1/board-htcherald.c:297:2: warning: initialization makes pointer from integer without a cast [enabled by default] > arch/arm/mach-omap1/board-htcherald.c:297:2: warning: (near initialization for 'gpio_leds[1].gpiod') [enabled by default] > > To be on the safe side move the 'gpiod' member to be the last member of struct > gpiod_led. > > Signed-off-by: Mika Westerberg > Acked-by: Arnd Bergmann Looks good to me. Should we also do the other patch to be on the safe side? 8<------- Subject: [PATCH] ARM: OMAP1: htcherald: use named initializers for gpio-leds A recent change to the gpio-leds driver broke the platform data definition in the htcherald file: arch/arm/mach-omap1/board-htcherald.c:296:2: warning: initialization makes pointer from integer without a cast [enabled by default] The gpio-led driver is being changed to avoid that problem, but it would also be good to make the board file use named initializers like every other one, so it won't happen again. Signed-off-by: Arnd Bergmann Reviewed-by: Mika Westerberg diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 35a2379b986f..259a54733e63 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -293,17 +293,18 @@ static struct platform_device herald_gpiokeys_device = { /* LEDs for the Herald. These connect to the HTCPLD GPIO device. */ static struct gpio_led gpio_leds[] = { - {"dpad", NULL, HTCPLD_GPIO_LED_DPAD, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"kbd", NULL, HTCPLD_GPIO_LED_KBD, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"vibrate", NULL, HTCPLD_GPIO_LED_VIBRATE, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"green_solid", NULL, HTCPLD_GPIO_LED_GREEN_SOLID, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"green_flash", NULL, HTCPLD_GPIO_LED_GREEN_FLASH, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"red_solid", "mmc0", HTCPLD_GPIO_LED_RED_SOLID, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"red_flash", NULL, HTCPLD_GPIO_LED_RED_FLASH, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"wifi", NULL, HTCPLD_GPIO_LED_WIFI, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"bt", NULL, HTCPLD_GPIO_LED_BT, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"caps", NULL, HTCPLD_GPIO_LED_CAPS, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, - {"alt", NULL, HTCPLD_GPIO_LED_ALT, 0, 0, LEDS_GPIO_DEFSTATE_OFF}, + { .name = "dpad", .gpio = HTCPLD_GPIO_LED_DPAD, }, + { .name = "kbd", .gpio = HTCPLD_GPIO_LED_KBD, }, + { .name = "vibrate", .gpio = HTCPLD_GPIO_LED_VIBRATE, }, + { .name = "green_solid", .gpio = HTCPLD_GPIO_LED_GREEN_SOLID, }, + { .name = "green_flash", .gpio = HTCPLD_GPIO_LED_GREEN_FLASH, }, + { .name = "red_solid", .default_trigger = "mmc0", + .gpio = HTCPLD_GPIO_LED_RED_SOLID, }, + { .name = "red_flash", .gpio = HTCPLD_GPIO_LED_RED_FLASH, }, + { .name = "wifi", .gpio = HTCPLD_GPIO_LED_WIFI, }, + { .name = "bt", .gpio = HTCPLD_GPIO_LED_BT, }, + { .name = "caps", .gpio = HTCPLD_GPIO_LED_CAPS, }, + { .name = "alt", .gpio = HTCPLD_GPIO_LED_ALT, }, }; static struct gpio_led_platform_data gpio_leds_data = {