From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F134C00140 for ; Fri, 5 Aug 2022 15:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241419AbiHEPvg (ORCPT ); Fri, 5 Aug 2022 11:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241315AbiHEPvQ (ORCPT ); Fri, 5 Aug 2022 11:51:16 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7159C61B2D; Fri, 5 Aug 2022 08:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714552; x=1691250552; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b85nclneF9BX61RtcZxdbpTMJV7DSQfjZ+m4p4X2wC0=; b=dgOXyW/Hh6aAEwzSx/hoeQt06N4RLzgUGtxd27m9HmZlyETy+liDnr8s Rl/+38jJYzOaIrK/Mjt3ctyCv74FP3kRrkysXw+GIN9o+ja2XlTy0oJAC i6CnLl4Axb+oAyt9V2S5Lm7vuflzQVYaUCdQ3OnYBq+cP5G8lNAOYw651 yM19jzwxLAqywBX694f/cvm79P3nPvlStlmdfL3a5NJDvDJcl6Iai/4dQ LUKiwnaivL4zeDu17ghpxEV9XSYckLbAfcBiRxfLwk6C+JaM7Eui8qk8R x6K/HdzwPcrZBtKg9D9dQTtDlUQumKoFX/cI+THlm758HXREx5Zl6TuZV Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="291450564" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="291450564" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="931271130" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 05 Aug 2022 08:49:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 94660D9; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 01/11] leds: add missing includes and forward declarations in leds.h Date: Fri, 5 Aug 2022 18:48:57 +0300 Message-Id: <20220805154907.32263-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add missing includes and forward declarations to leds.h. While at it, replace headers by forward declarations and vise versa. Signed-off-by: Andy Shevchenko --- include/linux/leds.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/leds.h b/include/linux/leds.h index ba4861ec73d3..499aea1e59b9 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -10,17 +10,21 @@ =20 #include #include -#include -#include #include #include #include #include +#include #include =20 -struct device; -struct led_pattern; +struct attribute_group; struct device_node; +struct fwnode_handle; +struct gpio_desc; +struct kernfs_node; +struct led_pattern; +struct platform_device; + /* * LED Core */ @@ -508,7 +512,6 @@ struct led_properties { const char *label; }; =20 -struct gpio_desc; typedef int (*gpio_blink_set_t)(struct gpio_desc *desc, int state, unsigned long *delay_on, unsigned long *delay_off); --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAF71C25B08 for ; Fri, 5 Aug 2022 15:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241074AbiHEPwZ (ORCPT ); Fri, 5 Aug 2022 11:52:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241375AbiHEPvW (ORCPT ); Fri, 5 Aug 2022 11:51:22 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 131E46E889; Fri, 5 Aug 2022 08:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714565; x=1691250565; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NEeFuL7s2HGlJGPjMrfp/6jwPjBk7uYpbdHP2kx39AA=; b=j2Aab5WItV/SZwOnPcAeZzG5yLiHM0GQJABTBTn3zqWmrNiMTO8brpLj otDFaa8/46PhoJbi7dLjs0OWm9PYkV9tYAUWViQ6sLzxRp6wMBCVh1bac /vzGup1EXp77D6UGBFzD9XVKAF2Vh6DF3f4TFN607d+w87b8iyRMBMiQI GMzBKUrCU+ixcU6xayivS2x7mZMAZkgx+BXIJ1qNioiEYG0DYFd5GqoT2 v5WnCnYO0gvSxhgJIfKa7pbcysgLbUV1DqMd05Yg1wuV1eHHEcnT8wYkb wRngbhPxkt5mm0M5eH/UZDgpns1vJQmaC5YvnSi59SW+uwj+T1mK+4rHX g==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="288988398" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="288988398" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="693037566" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2022 08:49:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9D8FC11C; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 02/11] leds: Move led_init_default_state_get() to the global header Date: Fri, 5 Aug 2022 18:48:58 +0300 Message-Id: <20220805154907.32263-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are users inside and outside LED framework that have implemented a local copy of led_init_default_state_get(). In order to deduplicate that, as the first step move the declaration from LED header to the global one. Signed-off-by: Andy Shevchenko --- drivers/leds/leds.h | 1 - include/linux/leds.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h index aa64757a4d89..345062ccabda 100644 --- a/drivers/leds/leds.h +++ b/drivers/leds/leds.h @@ -27,7 +27,6 @@ ssize_t led_trigger_read(struct file *filp, struct kobjec= t *kobj, ssize_t led_trigger_write(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t pos, size_t count); -enum led_default_state led_init_default_state_get(struct fwnode_handle *fw= node); =20 extern struct rw_semaphore leds_list_lock; extern struct list_head leds_list; diff --git a/include/linux/leds.h b/include/linux/leds.h index 499aea1e59b9..b96feacc73f8 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -67,6 +67,8 @@ struct led_init_data { bool devname_mandatory; }; =20 +enum led_default_state led_init_default_state_get(struct fwnode_handle *fw= node); + struct led_hw_trigger_type { int dummy; }; --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EACA6C00140 for ; Fri, 5 Aug 2022 15:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241436AbiHEPvj (ORCPT ); Fri, 5 Aug 2022 11:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241323AbiHEPvR (ORCPT ); Fri, 5 Aug 2022 11:51:17 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E84F06611B; Fri, 5 Aug 2022 08:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714555; x=1691250555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nHnWOVfew8TcWbs/bmlCO+Rb3gJGgB68Y5o1rear14Y=; b=TJGX8VukUXjJqVd4FLwyNe64hjhqTa7jc2D/5efAqbVh1/hHM36sINtU FAh42xaL+VUCxNss19Md3NLUtgdZYVRWqavqq8awrGlblhlfi6KhR+rAG /UcnLrnGMXOGPyxz+szpGo/hsO3X89sPRjy1oLTnJEtTnsH/QFqa4SEwA qFl1L2nacrlpNeiGEwJf67thplrISQkYmzvmREaN0HOQRjYyJubFrfq4G FSt+u5e7UlA0srja4QCCt2nEOEZaPsuL7ClzlHU6ubOC+lLkkKh9kfZ03 zYFlOSL8s2eQp3g4/c6BjsgOp5Lgblr4/6P7t8Iod2GNu8UUUzn8UHz8c A==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="351943661" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="351943661" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="603631124" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Aug 2022 08:49:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id A69711D0; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 03/11] leds: an30259a: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:48:59 +0300 Message-Id: <20220805154907.32263-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-an30259a.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/leds/leds-an30259a.c b/drivers/leds/leds-an30259a.c index a0df1fb28774..d7db47cf859b 100644 --- a/drivers/leds/leds-an30259a.c +++ b/drivers/leds/leds-an30259a.c @@ -55,10 +55,6 @@ =20 #define AN30259A_NAME "an30259a" =20 -#define STATE_OFF 0 -#define STATE_KEEP 1 -#define STATE_ON 2 - struct an30259a; =20 struct an30259a_led { @@ -66,7 +62,7 @@ struct an30259a_led { struct fwnode_handle *fwnode; struct led_classdev cdev; u32 num; - u32 default_state; + enum led_default_state default_state; bool sloping; }; =20 @@ -205,7 +201,6 @@ static int an30259a_dt_init(struct i2c_client *client, struct device_node *np =3D dev_of_node(&client->dev), *child; int count, ret; int i =3D 0; - const char *str; struct an30259a_led *led; =20 count =3D of_get_available_child_count(np); @@ -228,15 +223,7 @@ static int an30259a_dt_init(struct i2c_client *client, led->num =3D source; led->chip =3D chip; led->fwnode =3D of_fwnode_handle(child); - - if (!of_property_read_string(child, "default-state", &str)) { - if (!strcmp(str, "on")) - led->default_state =3D STATE_ON; - else if (!strcmp(str, "keep")) - led->default_state =3D STATE_KEEP; - else - led->default_state =3D STATE_OFF; - } + led->default_state =3D led_init_default_state_get(led->fwnode); =20 i++; } @@ -261,10 +248,10 @@ static void an30259a_init_default_state(struct an3025= 9a_led *led) int led_on, err; =20 switch (led->default_state) { - case STATE_ON: + case LEDS_DEFSTATE_ON: led->cdev.brightness =3D LED_FULL; break; - case STATE_KEEP: + case LEDS_DEFSTATE_KEEP: err =3D regmap_read(chip->regmap, AN30259A_REG_LED_ON, &led_on); if (err) break; --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5971AC25B08 for ; Fri, 5 Aug 2022 15:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241405AbiHEPvc (ORCPT ); Fri, 5 Aug 2022 11:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241314AbiHEPvQ (ORCPT ); Fri, 5 Aug 2022 11:51:16 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E63C5C9F3; Fri, 5 Aug 2022 08:49:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714551; x=1691250551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LCJNwKIb2JZh9SO69nCDrOY4AomaNFhl38g2hoPWX0w=; b=nxuzY1Tk8GHN4O5v0jAr+WbFxGH1oiuttHAtWEyG1MuxSOzuX3+xhHOW jJCTqa0gOdMVvXSVQommh0Sw59AWEXTfhw1ScVmGCY/ZozADCcKeP3HH/ dE9fXG+US/Q9itpjDe0ooQADbYg5eHhjerwDsnlABa5UDF4bxdP7MoEy5 Kt1BZF6fFM4LRev18e+krgfAag9W8zlBymw12twP8UE7tzx9gku4M/3yV aShF68WaRyaiczxOrafq8nTvpEsbNtv/+a5xbyamLieEEHRa740zBJC2+ 51a6ERQ2/hlvlixsY2FMJk+wUsMEho6Qily/7Jj9b4AYyC54XvYHh2DlZ w==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="269999196" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="269999196" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="671727790" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 05 Aug 2022 08:49:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AFA151DF; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 04/11] leds: bcm6328: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:00 +0300 Message-Id: <20220805154907.32263-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-bcm6328.c | 49 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c index 2d4d87957a30..246f1296ab09 100644 --- a/drivers/leds/leds-bcm6328.c +++ b/drivers/leds/leds-bcm6328.c @@ -330,7 +330,9 @@ static int bcm6328_led(struct device *dev, struct devic= e_node *nc, u32 reg, { struct led_init_data init_data =3D {}; struct bcm6328_led *led; - const char *state; + enum led_default_state state; + unsigned long val, shift; + void __iomem *mode; int rc; =20 led =3D devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); @@ -346,31 +348,29 @@ static int bcm6328_led(struct device *dev, struct dev= ice_node *nc, u32 reg, if (of_property_read_bool(nc, "active-low")) led->active_low =3D true; =20 - if (!of_property_read_string(nc, "default-state", &state)) { - if (!strcmp(state, "on")) { + init_data.fwnode =3D of_fwnode_handle(nc); + + state =3D led_init_default_state_get(init_data.fwnode); + switch (state) { + case LEDS_DEFSTATE_ON: + led->cdev.brightness =3D LED_FULL; + break; + case LEDS_DEFSTATE_KEEP: + shift =3D bcm6328_pin2shift(led->pin); + if (shift / 16) + mode =3D mem + BCM6328_REG_MODE_HI; + else + mode =3D mem + BCM6328_REG_MODE_LO; + + val =3D bcm6328_led_read(mode) >> BCM6328_LED_SHIFT(shift % 16); + val &=3D BCM6328_LED_MODE_MASK; + if ((led->active_low && val =3D=3D BCM6328_LED_MODE_OFF) || + (!led->active_low && val =3D=3D BCM6328_LED_MODE_ON)) led->cdev.brightness =3D LED_FULL; - } else if (!strcmp(state, "keep")) { - void __iomem *mode; - unsigned long val, shift; - - shift =3D bcm6328_pin2shift(led->pin); - if (shift / 16) - mode =3D mem + BCM6328_REG_MODE_HI; - else - mode =3D mem + BCM6328_REG_MODE_LO; - - val =3D bcm6328_led_read(mode) >> - BCM6328_LED_SHIFT(shift % 16); - val &=3D BCM6328_LED_MODE_MASK; - if ((led->active_low && val =3D=3D BCM6328_LED_MODE_OFF) || - (!led->active_low && val =3D=3D BCM6328_LED_MODE_ON)) - led->cdev.brightness =3D LED_FULL; - else - led->cdev.brightness =3D LED_OFF; - } else { + else led->cdev.brightness =3D LED_OFF; - } - } else { + break; + default: led->cdev.brightness =3D LED_OFF; } =20 @@ -378,7 +378,6 @@ static int bcm6328_led(struct device *dev, struct devic= e_node *nc, u32 reg, =20 led->cdev.brightness_set =3D bcm6328_led_set; led->cdev.blink_set =3D bcm6328_blink_set; - init_data.fwnode =3D of_fwnode_handle(nc); =20 rc =3D devm_led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0) --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94279C25B07 for ; Fri, 5 Aug 2022 15:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241454AbiHEPvs (ORCPT ); Fri, 5 Aug 2022 11:51:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241333AbiHEPvS (ORCPT ); Fri, 5 Aug 2022 11:51:18 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E156612F; Fri, 5 Aug 2022 08:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714556; x=1691250556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1IsTbKM8jNHxj4ziPqVComygZINDozfOXf+AY99bFeg=; b=T+4kcgxqSchOdDxr/wPUz19NRr7Z7aqqH1IVL+dBpzHnoge9HXdtiCWU fy65ae//p4XQOUgiO414HrLhTtHiOrLQkrYj3m8SUb8JT7Rw8n9hz5TYh uR9Oo2GXLNKTkVSu2ufaDv71DfYHDSDpJuWkxU8HpMQyaED2lSsmFDeT0 H2Q2YKNk9lwoEP8eib3S0/hSh1bYPNs6Lecdsvc9ZIUvLMd/u3zeH55a4 WZ3AYwF39ukUcR323kGPgWzE3ZjqHbDrkj8W0pBhm/ui0ia+lQI37da0J KxvDujPfMbt3Dg4LhhEODhpSmUY4gck2uyAejyHplxswOjNbt3IWrLtrV g==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="291450588" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="291450588" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="931271163" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 05 Aug 2022 08:49:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id BCCB5303; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 05/11] leds: bcm6358: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:01 +0300 Message-Id: <20220805154907.32263-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-bcm6358.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/leds/leds-bcm6358.c b/drivers/leds/leds-bcm6358.c index 9d2e487fa08a..86e51d44a5a7 100644 --- a/drivers/leds/leds-bcm6358.c +++ b/drivers/leds/leds-bcm6358.c @@ -96,7 +96,8 @@ static int bcm6358_led(struct device *dev, struct device_= node *nc, u32 reg, { struct led_init_data init_data =3D {}; struct bcm6358_led *led; - const char *state; + enum led_default_state state; + unsigned long val; int rc; =20 led =3D devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); @@ -110,29 +111,28 @@ static int bcm6358_led(struct device *dev, struct dev= ice_node *nc, u32 reg, if (of_property_read_bool(nc, "active-low")) led->active_low =3D true; =20 - if (!of_property_read_string(nc, "default-state", &state)) { - if (!strcmp(state, "on")) { + init_data.fwnode =3D of_fwnode_handle(nc); + + state =3D led_init_default_state_get(init_data.fwnode); + switch (state) { + case LEDS_DEFSTATE_ON: + led->cdev.brightness =3D LED_FULL; + break; + case LEDS_DEFSTATE_KEEP: + val =3D bcm6358_led_read(led->mem + BCM6358_REG_MODE); + val &=3D BIT(led->pin); + if ((led->active_low && !val) || (!led->active_low && val)) led->cdev.brightness =3D LED_FULL; - } else if (!strcmp(state, "keep")) { - unsigned long val; - val =3D bcm6358_led_read(led->mem + BCM6358_REG_MODE); - val &=3D BIT(led->pin); - if ((led->active_low && !val) || - (!led->active_low && val)) - led->cdev.brightness =3D LED_FULL; - else - led->cdev.brightness =3D LED_OFF; - } else { + else led->cdev.brightness =3D LED_OFF; - } - } else { + break; + default: led->cdev.brightness =3D LED_OFF; } =20 bcm6358_led_set(&led->cdev, led->cdev.brightness); =20 led->cdev.brightness_set =3D bcm6358_led_set; - init_data.fwnode =3D of_fwnode_handle(nc); =20 rc =3D devm_led_classdev_register_ext(dev, &led->cdev, &init_data); if (rc < 0) --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1B67C25B0D for ; Fri, 5 Aug 2022 15:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241491AbiHEPwC (ORCPT ); Fri, 5 Aug 2022 11:52:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241351AbiHEPvU (ORCPT ); Fri, 5 Aug 2022 11:51:20 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7101D6BD44; Fri, 5 Aug 2022 08:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714558; x=1691250558; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OunVwjFJhL1Q/tamMZepaupTRMyzPHvHM30RUkvfBQg=; b=ee76pxK95F2kPO0hw+AVtP0+sMSIvnSA8bbC772wAp9UilR1+4u/6Ii+ RdiqSiTXy5FAUls6NY89my/LiVX/E70DPgufoYarl4WGCck6in2QFlOFY UdTFyHLS2IAkFy4Kzn2MGilrmvmzYfoOXuXfUskd4DGKgsBUQiOE/Y0Rg Bxyh8mef4TVFpra7RsSCRrgMlAP8/SPB6aHikhVfw4e2NLg9A6IllNvTx 6q9Pvl8NFD5hiD+Dkdie1u7I8YApe9P66Ia7UQ2TulJB8rtEdT2LfoGvW QyMwCQwIKlrFZNg17tt1/JijkC07dvnX0SbykOxKpZDFFokPrbPvwZgMx g==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="316120626" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="316120626" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="693037586" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2022 08:49:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C8674347; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 06/11] leds: mt6323: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:02 +0300 Message-Id: <20220805154907.32263-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-mt6323.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/leds/leds-mt6323.c b/drivers/leds/leds-mt6323.c index f59e0e8bda8b..17ee88043f52 100644 --- a/drivers/leds/leds-mt6323.c +++ b/drivers/leds/leds-mt6323.c @@ -339,23 +339,23 @@ static int mt6323_led_set_dt_default(struct led_class= dev *cdev, struct device_node *np) { struct mt6323_led *led =3D container_of(cdev, struct mt6323_led, cdev); - const char *state; + enum led_default_state state; int ret =3D 0; =20 - state =3D of_get_property(np, "default-state", NULL); - if (state) { - if (!strcmp(state, "keep")) { - ret =3D mt6323_get_led_hw_brightness(cdev); - if (ret < 0) - return ret; - led->current_brightness =3D ret; - ret =3D 0; - } else if (!strcmp(state, "on")) { - ret =3D - mt6323_led_set_brightness(cdev, cdev->max_brightness); - } else { - ret =3D mt6323_led_set_brightness(cdev, LED_OFF); - } + state =3D led_init_default_state_get(of_fwnode_handle(np)); + switch (state) { + case LEDS_DEFSTATE_ON: + ret =3D mt6323_led_set_brightness(cdev, cdev->max_brightness); + break; + case LEDS_DEFSTATE_KEEP: + ret =3D mt6323_get_led_hw_brightness(cdev); + if (ret < 0) + return ret; + led->current_brightness =3D ret; + ret =3D 0; + break; + default: + ret =3D mt6323_led_set_brightness(cdev, LED_OFF); } =20 return ret; --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7053C25B08 for ; Fri, 5 Aug 2022 15:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241501AbiHEPwQ (ORCPT ); Fri, 5 Aug 2022 11:52:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241377AbiHEPvW (ORCPT ); Fri, 5 Aug 2022 11:51:22 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4232A6E2C8; Fri, 5 Aug 2022 08:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714566; x=1691250566; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6f8YWbifkD3gaKrThtIFn69fcF7c6kePJ4btJm1Xl8s=; b=U9Ik+QRGBf+Vh/ss4vqQD+2/0NIsOELqCCVrC3Um7ar7jj/9GTVhXiWK Dfy566I/a7JYOTTquyH/d0Wlfmg5By1GWtlxeEs/XrJd68EbRGxDDig6h n57thIkK0oqf+5BHDiwbVCUAajYilBPA8+A4HwxDSHWLle/RdZCKaV+8G EQkdxvACXGnCtP4xvdgN7KCIMo7SYkeH05y8il1VElPNZUA6ZOlXS7tGN 58hwdwS/PhBGQ4DvavGCvS3R43qYjJkVRxaQrjzongTcbPfVrLbtbb/i2 SJoEsyiBxDs4ejzP1onByGismKamcL5O5RhD7CbWBmyWuSdLgEP2jOohm w==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="288988429" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="288988429" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="554142979" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 05 Aug 2022 08:49:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D4D10417; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 07/11] leds: mt6360: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:03 +0300 Message-Id: <20220805154907.32263-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko Reviewed-by: Matthias Brugger --- drivers/leds/flash/leds-mt6360.c | 38 +++++--------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/drivers/leds/flash/leds-mt6360.c b/drivers/leds/flash/leds-mt6= 360.c index e1066a52d2d2..1af6c5898343 100644 --- a/drivers/leds/flash/leds-mt6360.c +++ b/drivers/leds/flash/leds-mt6360.c @@ -71,10 +71,6 @@ enum { #define MT6360_STRBTO_STEPUS 32000 #define MT6360_STRBTO_MAXUS 2432000 =20 -#define STATE_OFF 0 -#define STATE_KEEP 1 -#define STATE_ON 2 - struct mt6360_led { union { struct led_classdev isnk; @@ -84,7 +80,7 @@ struct mt6360_led { struct v4l2_flash *v4l2_flash; struct mt6360_priv *priv; u32 led_no; - u32 default_state; + enum led_default_state default_state; }; =20 struct mt6360_priv { @@ -405,10 +401,10 @@ static int mt6360_isnk_init_default_state(struct mt63= 60_led *led) level =3D LED_OFF; =20 switch (led->default_state) { - case STATE_ON: + case LEDS_DEFSTATE_ON: led->isnk.brightness =3D led->isnk.max_brightness; break; - case STATE_KEEP: + case LEDS_DEFSTATE_KEEP: led->isnk.brightness =3D min(level, led->isnk.max_brightness); break; default: @@ -443,10 +439,10 @@ static int mt6360_flash_init_default_state(struct mt6= 360_led *led) level =3D LED_OFF; =20 switch (led->default_state) { - case STATE_ON: + case LEDS_DEFSTATE_ON: flash->led_cdev.brightness =3D flash->led_cdev.max_brightness; break; - case STATE_KEEP: + case LEDS_DEFSTATE_KEEP: flash->led_cdev.brightness =3D min(level, flash->led_cdev.max_brightness); break; @@ -760,25 +756,6 @@ static int mt6360_init_flash_properties(struct mt6360_= led *led, return 0; } =20 -static int mt6360_init_common_properties(struct mt6360_led *led, - struct led_init_data *init_data) -{ - const char *const states[] =3D { "off", "keep", "on" }; - const char *str; - int ret; - - if (!fwnode_property_read_string(init_data->fwnode, - "default-state", &str)) { - ret =3D match_string(states, ARRAY_SIZE(states), str); - if (ret < 0) - ret =3D STATE_OFF; - - led->default_state =3D ret; - } - - return 0; -} - static void mt6360_v4l2_flash_release(struct mt6360_priv *priv) { int i; @@ -852,10 +829,7 @@ static int mt6360_led_probe(struct platform_device *pd= ev) =20 led->led_no =3D reg; led->priv =3D priv; - - ret =3D mt6360_init_common_properties(led, &init_data); - if (ret) - goto out_flash_release; + led->default_state =3D led_init_default_state_get(child); =20 if (reg =3D=3D MT6360_VIRTUAL_MULTICOLOR || reg <=3D MT6360_LED_ISNKML) --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DED95C00140 for ; Fri, 5 Aug 2022 15:52:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241495AbiHEPwI (ORCPT ); Fri, 5 Aug 2022 11:52:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241360AbiHEPvU (ORCPT ); Fri, 5 Aug 2022 11:51:20 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 365E06BD74; Fri, 5 Aug 2022 08:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714559; x=1691250559; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VQzFMWOPVcFhsKxRl9Czr0Mhj2oriMu0x8VLNQGEUCY=; b=KS87/PFud5pn+W3b/ZGkNaAFFOhS+7ErxiCgAsquYvk/4xfX+AnVxzXY r4nc+d7rds2DqWFpy+5pckwr+5jSmBvLhSB9sgWkSS0+2+iyWcNZjXqar 1xX8pwnJkImSTxvufnZ1up0ZXtttLOyoWPh1chOQ4ImUKQUenhnOn2JSv UvONSKeK/Ol/WAH18tLlmFL1/gJBukFLvMF+AKc86RPHF05nBpt177qV5 9TMQH65jerJYe+1sRzdPQ8PZt2HaZ+fmqostP8EBptAvt68vP03IVU7aC G6UCj6c08vpNE5VkIK+24AhYbfctcoapYvrucA00L+hVxspQbqzMq4H22 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="291003149" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="291003149" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="600399032" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 05 Aug 2022 08:49:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id E0D9141F; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 08/11] leds: pca955x: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:04 +0300 Message-Id: <20220805154907.32263-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-pca955x.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index 81aaf21212d7..8dca6f99e699 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c @@ -130,7 +130,7 @@ struct pca955x_led { struct led_classdev led_cdev; int led_num; /* 0 .. 15 potentially */ u32 type; - int default_state; + enum led_default_state default_state; struct fwnode_handle *fwnode; }; =20 @@ -443,7 +443,6 @@ pca955x_get_pdata(struct i2c_client *client, struct pca= 955x_chipdef *chip) return ERR_PTR(-ENOMEM); =20 device_for_each_child_node(&client->dev, child) { - const char *state; u32 reg; int res; =20 @@ -454,19 +453,9 @@ pca955x_get_pdata(struct i2c_client *client, struct pc= a955x_chipdef *chip) led =3D &pdata->leds[reg]; led->type =3D PCA955X_TYPE_LED; led->fwnode =3D child; - fwnode_property_read_u32(child, "type", &led->type); + led->default_state =3D led_init_default_state_get(child); =20 - if (!fwnode_property_read_string(child, "default-state", - &state)) { - if (!strcmp(state, "keep")) - led->default_state =3D LEDS_GPIO_DEFSTATE_KEEP; - else if (!strcmp(state, "on")) - led->default_state =3D LEDS_GPIO_DEFSTATE_ON; - else - led->default_state =3D LEDS_GPIO_DEFSTATE_OFF; - } else { - led->default_state =3D LEDS_GPIO_DEFSTATE_OFF; - } + fwnode_property_read_u32(child, "type", &led->type); } =20 pdata->num_leds =3D chip->bits; @@ -578,13 +567,11 @@ static int pca955x_probe(struct i2c_client *client) led->brightness_set_blocking =3D pca955x_led_set; led->brightness_get =3D pca955x_led_get; =20 - if (pdata->leds[i].default_state =3D=3D - LEDS_GPIO_DEFSTATE_OFF) { + if (pdata->leds[i].default_state =3D=3D LEDS_DEFSTATE_OFF) { err =3D pca955x_led_set(led, LED_OFF); if (err) return err; - } else if (pdata->leds[i].default_state =3D=3D - LEDS_GPIO_DEFSTATE_ON) { + } else if (pdata->leds[i].default_state =3D=3D LEDS_DEFSTATE_ON) { err =3D pca955x_led_set(led, LED_FULL); if (err) return err; @@ -623,8 +610,7 @@ static int pca955x_probe(struct i2c_client *client) * brightness to see if it's using PWM1. If so, PWM1 * should not be written below. */ - if (pdata->leds[i].default_state =3D=3D - LEDS_GPIO_DEFSTATE_KEEP) { + if (pdata->leds[i].default_state =3D=3D LEDS_DEFSTATE_KEEP) { if (led->brightness !=3D LED_FULL && led->brightness !=3D LED_OFF && led->brightness !=3D LED_HALF) --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23529C25B07 for ; Fri, 5 Aug 2022 15:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241353AbiHEPv6 (ORCPT ); Fri, 5 Aug 2022 11:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241340AbiHEPvT (ORCPT ); Fri, 5 Aug 2022 11:51:19 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D0EA67C8F; Fri, 5 Aug 2022 08:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714556; x=1691250556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hvI26OhQ+1E3Y1b+RrDqvUOiyVnslqAALa2RhHdwGbY=; b=Gt16rXSJGhOwgU717iEScXQlc4+9DAlJ8icePXX5ZlShvlCWLf9jOXk9 99tRVUdZW/nE7gSPgRS/tAmCEIcETTbT/X6psGAqcW0WRkyrxvhFySBAp 1COjvp/dGuq3i2ABWtB5qTE7qASPqhHgP6b9c1Ln8X/j6P4FHGkCedlwD FgoMjYkLLCNAINiNH+ANRm+cH60tIZtJS+6Gm/PltxSImlrAWE8HU0ZSr pTDuI1ncZaoDV4s3D6QrENpunlzmKXDb64KbN6NekK2i+jrP9qcuRcDze Bj87aMDHJJCweSfBsuxHJoIGAv6N3AUZyIQqoBfnRGcKhlU6NB1/XyK2o w==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="291003150" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="291003150" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="600399033" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 05 Aug 2022 08:49:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id ECFC1450; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 09/11] leds: pm8058: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:05 +0300 Message-Id: <20220805154907.32263-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-pm8058.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c index fb2ab72c0c40..b9233f14b646 100644 --- a/drivers/leds/leds-pm8058.c +++ b/drivers/leds/leds-pm8058.c @@ -93,8 +93,8 @@ static int pm8058_led_probe(struct platform_device *pdev) struct device_node *np; int ret; struct regmap *map; - const char *state; enum led_brightness maxbright; + enum led_default_state state; =20 led =3D devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); if (!led) @@ -125,25 +125,26 @@ static int pm8058_led_probe(struct platform_device *p= dev) maxbright =3D 15; /* 4 bits */ led->cdev.max_brightness =3D maxbright; =20 - state =3D of_get_property(np, "default-state", NULL); - if (state) { - if (!strcmp(state, "keep")) { - led->cdev.brightness =3D pm8058_led_get(&led->cdev); - } else if (!strcmp(state, "on")) { - led->cdev.brightness =3D maxbright; - pm8058_led_set(&led->cdev, maxbright); - } else { - led->cdev.brightness =3D LED_OFF; - pm8058_led_set(&led->cdev, LED_OFF); - } + init_data.fwnode =3D of_fwnode_handle(np); + + state =3D led_init_default_state_get(init_data.fwnode); + switch (state) { + case LEDS_DEFSTATE_ON: + led->cdev.brightness =3D maxbright; + pm8058_led_set(&led->cdev, maxbright); + break; + case LEDS_DEFSTATE_KEEP: + led->cdev.brightness =3D pm8058_led_get(&led->cdev); + break; + default: + led->cdev.brightness =3D LED_OFF; + pm8058_led_set(&led->cdev, LED_OFF); } =20 if (led->ledtype =3D=3D PM8058_LED_TYPE_KEYPAD || led->ledtype =3D=3D PM8058_LED_TYPE_FLASH) led->cdev.flags =3D LED_CORE_SUSPENDRESUME; =20 - init_data.fwnode =3D of_fwnode_handle(np); - ret =3D devm_led_classdev_register_ext(dev, &led->cdev, &init_data); if (ret) dev_err(dev, "Failed to register LED for %pOF\n", np); --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFB46C00140 for ; Fri, 5 Aug 2022 15:51:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241460AbiHEPvx (ORCPT ); Fri, 5 Aug 2022 11:51:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241334AbiHEPvS (ORCPT ); Fri, 5 Aug 2022 11:51:18 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A7D467154; Fri, 5 Aug 2022 08:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714556; x=1691250556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jvEYSO7lW++ymJ0bBLH7ZRL0Q9IiAhclprxNUtYU6Os=; b=CIeTUa13qmrJYLXCR/bXJte7ghVZgiyOS45bQEvkweAev+s/FrtbR/tu leu9LBusXYMyeBTx99a3TPkv08gjdRCAogUW7Ugv6UzBPta1jkFh//uDq WlOcIKjKSxbCwZnouPNIcSBlUh/NQQvaZLVVdgEIDTnSagbdivGFjgkPh 64KnttAV1PP2bcbdd0TozvreNsgs8zZW0PRVatFw/+hgFVc6iJf5EtYQd GAOa5esY20vvYGbaOCyflXnQhxVAdSyyz2DbR0IscWFfWmRI61VoPSOAB Shsa7Ad0fKwTpJh5rkVFcttN6jwnVBuRGdA7Y20IB7pUUXZe0jXY5TiVW g==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="277148756" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="277148756" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="706647818" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 05 Aug 2022 08:49:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0458B58E; Fri, 5 Aug 2022 18:49:16 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 10/11] leds: syscon: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:06 +0300 Message-Id: <20220805154907.32263-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko --- drivers/leds/leds-syscon.c | 49 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c index 7eddb8ecb44e..e38abb5e60c1 100644 --- a/drivers/leds/leds-syscon.c +++ b/drivers/leds/leds-syscon.c @@ -61,7 +61,8 @@ static int syscon_led_probe(struct platform_device *pdev) struct device *parent; struct regmap *map; struct syscon_led *sled; - const char *state; + enum led_default_state state; + u32 value; int ret; =20 parent =3D dev->parent; @@ -86,34 +87,30 @@ static int syscon_led_probe(struct platform_device *pde= v) if (of_property_read_u32(np, "mask", &sled->mask)) return -EINVAL; =20 - state =3D of_get_property(np, "default-state", NULL); - if (state) { - if (!strcmp(state, "keep")) { - u32 val; - - ret =3D regmap_read(map, sled->offset, &val); - if (ret < 0) - return ret; - sled->state =3D !!(val & sled->mask); - } else if (!strcmp(state, "on")) { - sled->state =3D true; - ret =3D regmap_update_bits(map, sled->offset, - sled->mask, - sled->mask); - if (ret < 0) - return ret; - } else { - sled->state =3D false; - ret =3D regmap_update_bits(map, sled->offset, - sled->mask, 0); - if (ret < 0) - return ret; - } + init_data.fwnode =3D of_fwnode_handle(np); + + state =3D led_init_default_state_get(init_data.fwnode); + switch (state) { + case LEDS_DEFSTATE_ON: + ret =3D regmap_update_bits(map, sled->offset, sled->mask, sled->mask); + if (ret < 0) + return ret; + sled->state =3D true; + break; + case LEDS_DEFSTATE_KEEP: + ret =3D regmap_read(map, sled->offset, &value); + if (ret < 0) + return ret; + sled->state =3D !!(value & sled->mask); + break; + default: + ret =3D regmap_update_bits(map, sled->offset, sled->mask, 0); + if (ret < 0) + return ret; + sled->state =3D false; } sled->cdev.brightness_set =3D syscon_led_set; =20 - init_data.fwnode =3D of_fwnode_handle(np); - ret =3D devm_led_classdev_register_ext(dev, &sled->cdev, &init_data); if (ret < 0) return ret; --=20 2.35.1 From nobody Thu Nov 14 08:49:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C3C9C25B08 for ; Fri, 5 Aug 2022 15:51:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241287AbiHEPvp (ORCPT ); Fri, 5 Aug 2022 11:51:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241326AbiHEPvS (ORCPT ); Fri, 5 Aug 2022 11:51:18 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CD3A6613D; Fri, 5 Aug 2022 08:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659714556; x=1691250556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kK0hPRdSyvWlZo38p4QMgn/ySqgObmyyzYJGxFidk7g=; b=N44OWTJsqE6EZYbTGJ7cJiX5xNQl1H6+s8CHwuL/KnZCUn+TTuy55cOH qPkablMoucizkQw2AcNZmZNubRk0UTKF7pfipRYwSbu7jh9fSchYAvkXn cwg500u7S5e96LJEuxSvHi3sSgSc0gJYfoVcMiWxyqx9sjSLqcgNxfFq9 or1z8YFZAReNBm7l54qUTu0JuLLrQnHpM0m1F1sk3zozEftchV874av7D 9WkcLcFONCpz8Nd+8uW2vfCZKXZhydyPtJg2735jmeNWb6EWsjsyKgy6C 4BgWCrQDpcVmSWlgqPQR3pnEu0SO9rv17621ymoi7pi5heKk6dp9oKm3k g==; X-IronPort-AV: E=McAfee;i="6400,9594,10430"; a="316120624" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="316120624" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 08:49:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="745891350" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 05 Aug 2022 08:49:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0FAF764F; Fri, 5 Aug 2022 18:49:17 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Pavel Machek , Eddie James , Denis Osterland-Heim , linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH v2 11/11] net: dsa: hellcreek: Get rid of custom led_init_default_state_get() Date: Fri, 5 Aug 2022 18:49:07 +0300 Message-Id: <20220805154907.32263-12-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> References: <20220805154907.32263-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LED core provides a helper to parse default state from firmware node. Use it instead of custom implementation. Signed-off-by: Andy Shevchenko Reviewed-by: Kurt Kanzenbach --- drivers/net/dsa/hirschmann/hellcreek_ptp.c | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/drivers/net/dsa/hirschmann/hellcreek_ptp.c b/drivers/net/dsa/h= irschmann/hellcreek_ptp.c index b28baab6d56a..793b2c296314 100644 --- a/drivers/net/dsa/hirschmann/hellcreek_ptp.c +++ b/drivers/net/dsa/hirschmann/hellcreek_ptp.c @@ -297,7 +297,8 @@ static enum led_brightness hellcreek_led_is_gm_get(stru= ct led_classdev *ldev) static int hellcreek_led_setup(struct hellcreek *hellcreek) { struct device_node *leds, *led =3D NULL; - const char *label, *state; + enum led_default_state state; + const char *label; int ret =3D -EINVAL; =20 of_node_get(hellcreek->dev->of_node); @@ -318,16 +319,17 @@ static int hellcreek_led_setup(struct hellcreek *hell= creek) ret =3D of_property_read_string(led, "label", &label); hellcreek->led_sync_good.name =3D ret ? "sync_good" : label; =20 - ret =3D of_property_read_string(led, "default-state", &state); - if (!ret) { - if (!strcmp(state, "on")) - hellcreek->led_sync_good.brightness =3D 1; - else if (!strcmp(state, "off")) - hellcreek->led_sync_good.brightness =3D 0; - else if (!strcmp(state, "keep")) - hellcreek->led_sync_good.brightness =3D - hellcreek_get_brightness(hellcreek, - STATUS_OUT_SYNC_GOOD); + state =3D led_init_default_state_get(of_fwnode_handle(led)); + switch (state) { + case LEDS_DEFSTATE_ON: + hellcreek->led_sync_good.brightness =3D 1; + break; + case LEDS_DEFSTATE_KEEP: + hellcreek->led_sync_good.brightness =3D + hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD); + break; + default: + hellcreek->led_sync_good.brightness =3D 0; } =20 hellcreek->led_sync_good.max_brightness =3D 1; @@ -344,16 +346,17 @@ static int hellcreek_led_setup(struct hellcreek *hell= creek) ret =3D of_property_read_string(led, "label", &label); hellcreek->led_is_gm.name =3D ret ? "is_gm" : label; =20 - ret =3D of_property_read_string(led, "default-state", &state); - if (!ret) { - if (!strcmp(state, "on")) - hellcreek->led_is_gm.brightness =3D 1; - else if (!strcmp(state, "off")) - hellcreek->led_is_gm.brightness =3D 0; - else if (!strcmp(state, "keep")) - hellcreek->led_is_gm.brightness =3D - hellcreek_get_brightness(hellcreek, - STATUS_OUT_IS_GM); + state =3D led_init_default_state_get(of_fwnode_handle(led)); + switch (state) { + case LEDS_DEFSTATE_ON: + hellcreek->led_is_gm.brightness =3D 1; + break; + case LEDS_DEFSTATE_KEEP: + hellcreek->led_is_gm.brightness =3D + hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM); + break; + default: + hellcreek->led_is_gm.brightness =3D 0; } =20 hellcreek->led_is_gm.max_brightness =3D 1; --=20 2.35.1