From patchwork Thu Nov 6 11:12:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 5241021 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F97D9F387 for ; Thu, 6 Nov 2014 11:12:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F4DC200F4 for ; Thu, 6 Nov 2014 11:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9B8C2010C for ; Thu, 6 Nov 2014 11:12:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751311AbaKFLMI (ORCPT ); Thu, 6 Nov 2014 06:12:08 -0500 Received: from mail-lb0-f178.google.com ([209.85.217.178]:60982 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbaKFLMH (ORCPT ); Thu, 6 Nov 2014 06:12:07 -0500 Received: by mail-lb0-f178.google.com with SMTP id f15so776018lbj.37 for ; Thu, 06 Nov 2014 03:12:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=VfH0ydteWTurNKzWeGNU21Lt0TnsSsetsiBuLPZq5V4=; b=EK7bZ/Y033fW4UxFmx3tE539j6v3u9ot2AkbP4L351MxufldcIo1+daBwLwrAB6lrM fk6BQUnIe/Oa+KNSoxBrUQHC2++UkoU40NJ7olfVmhcgnafto07KWwCf+9QJVhjzss7E QdR3jrbNDt75pn43mlj/2MOTyLDrCoBmicZgtF9DIWn+Q8OIAC8e40Lp9SL7VYzBcOLA oaXAkrxTZtZBai160Fw1xb7RtuHRHUBEaIrKU+C3StJL0MAHjAYz7pJxTiMfTefNasSp J60vQ/ZCMyFZQoJEDJmqEZyufm5dqebfQPRVEXaI8zrFKhTtkjaTwvXKta5UFQ/0ds1n 2Nqw== MIME-Version: 1.0 X-Received: by 10.112.170.99 with SMTP id al3mr4410884lbc.17.1415272324342; Thu, 06 Nov 2014 03:12:04 -0800 (PST) Received: by 10.152.30.34 with HTTP; Thu, 6 Nov 2014 03:12:04 -0800 (PST) In-Reply-To: <20141106105855.GL1618@lahna.fi.intel.com> References: <1414755658-96293-1-git-send-email-mika.westerberg@linux.intel.com> <545843B1.3020101@nvidia.com> <2455157.3p7mHhT8im@vostro.rjw.lan> <20141106103033.GK1618@lahna.fi.intel.com> <20141106105855.GL1618@lahna.fi.intel.com> Date: Thu, 6 Nov 2014 12:12:04 +0100 X-Google-Sender-Auth: m-TVktPzet2fHM7xLyN16f36OF8 Message-ID: Subject: Re: [PATCH] leds: leds-gpio: Convert gpio_blink_set() to use GPIO descriptors From: Geert Uytterhoeven To: Mika Westerberg Cc: "Rafael J. Wysocki" , Alexandre Courbot , Linus Walleij , Bryan Wu , Richard Purdie , Ben Dooks , Kukjin Kim , Jason Cooper , Andrew Lunn , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , ACPI Devel Maling List , Linux-sh list Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Hi Mika, On Thu, Nov 6, 2014 at 11:58 AM, Mika Westerberg wrote: > On Thu, Nov 06, 2014 at 11:32:19AM +0100, Geert Uytterhoeven wrote: >> On Thu, Nov 6, 2014 at 11:30 AM, Mika Westerberg >> wrote: >> >> "leds: leds-gpio: Add support for GPIO descriptors" broke leds-gpio on >> >> non-DT platforms for me: >> >> >> >> gpiod_direction_output: invalid GPIO >> >> leds-gpio: probe of leds-gpio failed with error -22 >> >> >> >> (desc is NULL in gpiod_direction_output()). >> >> >> >> DT shmobile reference/multi-platform are fine. >> >> >> >> I noticed the hard way, as I wanted to add some LEDs to a new platform, >> >> but couldn't get it work. It turned out it also had stopped working on >> >> r8a7740/armadillo-legacy, so I started bisecting... >> > >> > Which board file that is? >> > >> > There is a bug that gpio_to_desc() returns NULL instead if ERR_PTR() in >> > that patch but I wonder why gpio_is_valid() and devm_gpio_request_one() >> > do not complain about that prior. >> >> arch/arm/mach-shmobile/board-armadillo800eva.c > > Are you able to put some printks() to the 'if (!template->gpiod)' branch > so that it prints out gpio number and what does devm_gpio_request_one() > return? > > Something like: > > if (!template->gpiod) { > ... > ret = devm_gpio_request_one(parent, template->gpio, flags, > template->name); > dev_info(parent, "GPIO %u, ret: %d\n", template->gpio, ret); > if (ret < 0) > ... > > led_dat->gpiod = gpio_to_desc(template->gpio); > dev_info(parent, "GPIOD: %p\n", led_dat->gpiod); Sure: leds-gpio leds-gpio: GPIO 102, ret: 0 leds-gpio leds-gpio: GPIOD: c050e970 So led_dat is non-NULL. But it's overwritten by NULL later: led_dat->gpiod = template->gpiod; Whitespace damaged fix below, to fold into the original. If you prefer a proper separate patch, let me know. Gr{oetje,eeting}s, Geert Reviewed-by: Mika Westerberg --- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index ba4698c32bb04bde..b3c5d9d6a42bcd8b 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -92,7 +92,8 @@ static int create_gpio_led(const struct gpio_led *template, { int ret, state; - if (!template->gpiod) { + led_dat->gpiod = template->gpiod; + if (!led_dat->gpiod) { /* * This is the legacy code path for platform code that * still uses GPIO numbers. Ultimately we would like to get @@ -122,8 +123,7 @@ static int create_gpio_led(const struct gpio_led *template, led_dat->cdev.name = template->name; led_dat->cdev.default_trigger = template->default_trigger; - led_dat->gpiod = template->gpiod; - led_dat->can_sleep = gpiod_cansleep(template->gpiod); + led_dat->can_sleep = gpiod_cansleep(led_dat->gpiod); led_dat->blinking = 0; if (blink_set) { led_dat->platform_gpio_blink_set = blink_set;