From nobody Sat Sep 21 17:39:56 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 6CD38ECAAA1 for ; Tue, 6 Sep 2022 14:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241228AbiIFO00 (ORCPT ); Tue, 6 Sep 2022 10:26:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241802AbiIFOWK (ORCPT ); Tue, 6 Sep 2022 10:22:10 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A583F8B9B9; Tue, 6 Sep 2022 06:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472320; x=1694008320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b85nclneF9BX61RtcZxdbpTMJV7DSQfjZ+m4p4X2wC0=; b=PFnp4etxuMfRKm6Gohpt9to0dyMpl4kB8NmA2jDUuKfDJzLiUYtlIo/Q wGkdCbPF4M748vBPFoeTIO0x+y6mn+wmKZWT/rvlzxqC9SlKrErGvjL/P sWJfXyoUrty7tSz5qn5Xdn7Awou5R0rwQ0dsbZax3S6uMrBeRkP+F673Q xAaASbbMcU9qnDPZtUoXnhFZjQvS7E7eNLDjqCi3QvUHbwq0RaLZbhL4w +YomzI3LvfGz2++I0xb+zy+TGO+dF0pnGf0RgblER3FOqLM3EKtXqJq3j usSz7lntR/NV8DCPzqQW1EFP4uizV1WShNLVzxnCzZXbldV1QiJmhPwDu w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="297908809" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="297908809" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="756372522" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 06 Sep 2022 06:49:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5469186; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 01/11] leds: add missing includes and forward declarations in leds.h Date: Tue, 6 Sep 2022 16:49:54 +0300 Message-Id: <20220906135004.14885-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Sat Sep 21 17:39:56 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 42472ECAAD5 for ; Tue, 6 Sep 2022 14:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241901AbiIFOZ6 (ORCPT ); Tue, 6 Sep 2022 10:25:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241189AbiIFOUV (ORCPT ); Tue, 6 Sep 2022 10:20:21 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B95658B9B7; Tue, 6 Sep 2022 06:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472303; x=1694008303; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NEeFuL7s2HGlJGPjMrfp/6jwPjBk7uYpbdHP2kx39AA=; b=l0O/GBBPWExKVhfi92Ne8zSZC+S1XAYQWKMrqTgXGJ4XPPpBkTjxkerE KCnB1oZJW+cfeKcukOty1f/uOo1TqXlMQZ5mLQnNaXhGSu3OTK/4YzRAn ufkFX52iqzZvEGMBFjg182MUtHz6HvkWz9/DuFT8L/KiyDHeIYIZqvsTH AXLlW+2VpxOB18VMz3+1G0gg2a9uwqD1dc9ngbd7fP3SQ6DmzmLsQPOBN WTkLeYPgLqE1plDhcjeil7QPS/qiYaOYP/tOXPmrapv6Ck2+zlWYRKI6m KZlVxovoLxrjtVtPDiCQxXbQ3pnWpg6KVnHsHTwWzyjEF6Bed9iHgcU0s g==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="283591162" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="283591162" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:49:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="616712869" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 06 Sep 2022 06:49:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6404F363; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 02/11] leds: Move led_init_default_state_get() to the global header Date: Tue, 6 Sep 2022 16:49:55 +0300 Message-Id: <20220906135004.14885-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Sat Sep 21 17:39:56 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 03786ECAAA1 for ; Tue, 6 Sep 2022 14:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233491AbiIFOZd (ORCPT ); Tue, 6 Sep 2022 10:25:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242247AbiIFOUE (ORCPT ); Tue, 6 Sep 2022 10:20:04 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E8762125F; Tue, 6 Sep 2022 06:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472289; x=1694008289; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2vu7l/6K0nvkzNmUjyptRlngyguT+RoN4sYZnyNxAgU=; b=lRpy2C8F5k3gteHoI7LzQzY1HYFQcYvVxjUSsZIX/NHiz+2RtlOHU1Im dHvXt1eRbKcOPS67mVvWYudM+o7koDIsq/mpkm9/mjehBr/S36mCBHhgO eZ0ftE1Y0jEFuhbnLilaDGBogQc5eJvG/LP3PqfxcpGhfscmFoiGrrza0 +SN8EqxS7L1y0ayvmmadYoS3U5g+2YcQCOAiZpm8Td6+5BNXtL3GkQTtf IckA7YINkx2vHFnndbLkG/iY/6clODhrfrRFORBmtJ8hrQerW0ZrDAGs4 2Xi1y1tbg8VY+UYGLlq18SuPTAX21D7fCsBvueM1YJXuVhQrBDcG9OioG w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="279610086" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="279610086" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="756372523" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 06 Sep 2022 06:49:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6F82145C; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 03/11] leds: an30259a: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:49:56 +0300 Message-Id: <20220906135004.14885-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 e072ee5409f7..89df267853a9 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 Sat Sep 21 17:39:56 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 2C6C4ECAAD5 for ; Tue, 6 Sep 2022 14:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241721AbiIFOVc (ORCPT ); Tue, 6 Sep 2022 10:21:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241915AbiIFOS7 (ORCPT ); Tue, 6 Sep 2022 10:18:59 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A1832A439; Tue, 6 Sep 2022 06:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472203; x=1694008203; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LCJNwKIb2JZh9SO69nCDrOY4AomaNFhl38g2hoPWX0w=; b=H0m2Fc0hxduBkJUR+yfO/rr4D3CMq0Mv+ZeGNBE0Y58SC+8Oa5BHSOYA pM/oyE4z5d2uWC5Mj2cdNHrNuiZUglvwkNQPlzR+sqUBHBsLpW5UjYGIw lOW0oVLGpU+xITQD/zjePitA9gpSMaJ62ZmGNumRKZDlWKKAKc9DwHzxV vpSf0zj+kqiBpeYVrPyyOGUqJNgSqlM8jyBx72vAyRgDI+ozT+jty55HN tuaGmLzAB4ZDB3JpUl03bI1L2rWCMer8p4QnRt+4YCPuYaJvyXmlPBjat 8dlVf3a/JQb0w7dMcz85R7dsRIxD6u6MBvSLCWW0dShnRFlSKHMD22mfN Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="296597057" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="296597057" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:49:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="717702899" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 06 Sep 2022 06:49:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7B54750D; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 04/11] leds: bcm6328: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:49:57 +0300 Message-Id: <20220906135004.14885-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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: Florian Fainelli --- 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 Sat Sep 21 17:39:56 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 9DF98ECAAA1 for ; Tue, 6 Sep 2022 14:34:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237818AbiIFOeW (ORCPT ); Tue, 6 Sep 2022 10:34:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234128AbiIFOdK (ORCPT ); Tue, 6 Sep 2022 10:33:10 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 404B697EE6; Tue, 6 Sep 2022 06:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472720; x=1694008720; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1IsTbKM8jNHxj4ziPqVComygZINDozfOXf+AY99bFeg=; b=HNPFoyToa+pZ16RsswRDUu4S+b+NYGSt7psMcCPOo0k90l27BMU8xYAU hQ9fwGpxjANcN3jXetUssWyohQY2IM5s7525WJmi3kDiV5AD8z8Hjg2lw 22OjzX/KFYPZH4T3y/rNMYvjX74wTvCoY1n7sSCC3RWnKpfpqbBpa2Km7 Tr/uJSJRXStZAJwPEQKwsq1QFuL0ypUMfr52dFraOFpRCd8hBeGuZqAIb jHiLe1zfhUq32O+8lEilHRa11GiYf09jgNsKV9yFOj4H0kSV9qJX8QWha Mgb4/p65+DmPt18C6i4MUEnxR+XTA8Zckv4Vvuvk2nvx4SHkWHwHBlag6 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="294181921" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="294181921" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="703214850" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 86D8957F; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 05/11] leds: bcm6358: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:49:58 +0300 Message-Id: <20220906135004.14885-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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: Florian Fainelli --- 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 Sat Sep 21 17:39:56 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 0382DC6FA83 for ; Tue, 6 Sep 2022 14:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241243AbiIFOZu (ORCPT ); Tue, 6 Sep 2022 10:25:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242269AbiIFOUH (ORCPT ); Tue, 6 Sep 2022 10:20:07 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18F528C451; Tue, 6 Sep 2022 06:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472294; x=1694008294; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OunVwjFJhL1Q/tamMZepaupTRMyzPHvHM30RUkvfBQg=; b=Ug0tz9fpfe69o0nWMBq6YPDpR7kSBiJJXvG9dTvFMAuhsG4qXzWV59v2 47cl/OpCLhnTNjUi6B3hMZU+jTujuvJOZnZoFhRJFcnQWiPjQFgHZX1Yg eyEPife/Q/MiCeOO7wqap1plP4py5RJzKBPYuZTvAXcBF+MDdpsVJdbW2 IJ8kYgjiyAJHZXXjgkWCptiOKSHVx1otJw2Tf82WWozXH2zF8UMGqe5zQ y6F4XtKOLBB/OrssqzUnwmv1544sSqe+yccvUOTfVNRa7KZg4y+HDB0Oj Re0BRauTIqhkSLtw9AF+XnN/isqZ25V6ltG+U0Q6KsRfU2rnLUQAynI6B w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="279610093" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="279610093" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="717702934" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 923FE5E4; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 06/11] leds: mt6323: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:49:59 +0300 Message-Id: <20220906135004.14885-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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: AngeloGioacchino Del Regno --- 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 Sat Sep 21 17:39:56 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 8DAEBECAAD5 for ; Tue, 6 Sep 2022 14:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241844AbiIFO0h (ORCPT ); Tue, 6 Sep 2022 10:26:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241838AbiIFOWW (ORCPT ); Tue, 6 Sep 2022 10:22:22 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B247C539; Tue, 6 Sep 2022 06:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472318; x=1694008318; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6f8YWbifkD3gaKrThtIFn69fcF7c6kePJ4btJm1Xl8s=; b=GkOyEwYr1nD6C7JD+lJTan7wSpPj40P6Lv85zC1bto3N93Krp8VjJn1f U1fRRbcxbFWJp9FG6px0NABu/yYBDnaXAL5bgaP2ZotkRTcj3do4zwi82 bQhKTnoMNL0XRI4MQCbJCDYyzBf8DF6FU4EjOAOq1vSILSHJ+7pOuRmp5 +yOm9DndBGsnbK4vS9M8+XYai2dpmcb+DWTbXyNQIC4ksL6HYVVHqy4IK VYaCMi7vgwlRez/cAIvX97aUYqDcSTcLUq4+gJYWbY4iaq1umwWW/3V3+ 66Ud6UiwCf0ciWwDc3icF7eAGpynjRWS6Zud/RwhttDXGxWSpWkt9VfzQ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="297380992" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="297380992" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="859264824" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9E9636CD; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 07/11] leds: mt6360: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:50:00 +0300 Message-Id: <20220906135004.14885-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Reviewed-by: AngeloGioacchino Del Regno --- 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 Sat Sep 21 17:39:56 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 D2F4BECAAD5 for ; Tue, 6 Sep 2022 14:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241032AbiIFOWS (ORCPT ); Tue, 6 Sep 2022 10:22:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242011AbiIFOTQ (ORCPT ); Tue, 6 Sep 2022 10:19:16 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41A038A6D4; Tue, 6 Sep 2022 06:50: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=1662472226; x=1694008226; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VQzFMWOPVcFhsKxRl9Czr0Mhj2oriMu0x8VLNQGEUCY=; b=Gp03T1KnWdPbBwrUKYnpKJdm6Ws98wT6v//Q6sL7/DwdSwmIqQbbLTbs ojRLqMFf6Xt70Vx47IBK+17f5RlGIvRGFGZJCTlOMpzIOTQ/OsqVmVhFL kkw/pAMkh9FOT10OwA6Qg7kvzCGjadqZ4M1wghdP2jYUGcY2jVeqqYKKd kKvy+wrhflmhCBnxDhlAP6L115Ye/JB9H2mFAkMHJjL/dReN5T0hgq2Ck vyYcQfq30cBi5f6IoWLwFaw/kDPs7EUILUATNLJTZUnGRUP5Dypqg9CfA ViTpdBjczvaAV1OeoQq5qg4or+okX/dL59yE220GT5ATynePsE/sD5W47 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="276334194" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="276334194" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="591269676" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AAD8A6D1; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 08/11] leds: pca955x: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:50:01 +0300 Message-Id: <20220906135004.14885-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Sat Sep 21 17:39:56 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 32D88C6FA86 for ; Tue, 6 Sep 2022 14:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241842AbiIFOZz (ORCPT ); Tue, 6 Sep 2022 10:25:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242276AbiIFOUI (ORCPT ); Tue, 6 Sep 2022 10:20:08 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 328E78C452; Tue, 6 Sep 2022 06:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472294; x=1694008294; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hvI26OhQ+1E3Y1b+RrDqvUOiyVnslqAALa2RhHdwGbY=; b=ce2fkf3K/Zwn0zdK7wQuFalf4WzdZRiyfiiWLHDJEe/N1jMC3AOIjeP2 f6rFvUBJMCBRXgy3UhIN+W5//OcgPdBhkCfzz241AL0E/OApH4Y2yKbmU B0xDmKdA7wWkEOhL+4xLXE9mN3srOFcPwFZMHCWY2s83zwbVzfu8n7nFP X0V4iXEeDpyme4Po6IU8bZZnoY5/ofmFfGvtxB9feENrUMXaPXleHCbTA I+DtJ1Jj7ibcXFNI1aDut6y3mw8Y1AtikFJfbLYqYjGvHF4vh/5qA29Ec QNtbk8DTi+g0s3xJ+ohnrR1ds2hSp2X1THfZBs0kwm6VCEXSOLriQRhDh Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="297380983" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="297380983" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="675694894" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B5018238; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 09/11] leds: pm8058: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:50:02 +0300 Message-Id: <20220906135004.14885-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Sat Sep 21 17:39:56 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 963E2ECAAA1 for ; Tue, 6 Sep 2022 14:26:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242036AbiIFO0L (ORCPT ); Tue, 6 Sep 2022 10:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241415AbiIFOU1 (ORCPT ); Tue, 6 Sep 2022 10:20:27 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 470CB8B99F; Tue, 6 Sep 2022 06:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472305; x=1694008305; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jvEYSO7lW++ymJ0bBLH7ZRL0Q9IiAhclprxNUtYU6Os=; b=KLGWLfnHRuig99RWDZNPGKU2dL+zB2AEGaVtVh/ZEq6nDXUoop6a1BYf s2aMBtJxybALI9X1JddH6KkMZ0knE8VAHW2GT9MgN1jtdxYqe5tob+fo1 VBWwPheCLiQbTrvt3pi8VZw/EfYxdmJyGQLNrHgA4wl1dvZ/6v0ODyJZz IYyLlXXNS391QwUdAQKeo+DwrxPsLiVj1mOvU4cUSBxYY5I8KRIiVU8HL /s8fBGG7uKLq+pW3IqdN0TTPO1fOvs4nRju0SIjjrH6UR8B7XZQesR8fI fPdELs43FsoI+VGJb/mjuiG98veeGtqSSgcprWx59mWfyhuOZKAoIDS0O A==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="297380987" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="297380987" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="859264825" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C9088725; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 10/11] leds: syscon: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:50:03 +0300 Message-Id: <20220906135004.14885-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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 Sat Sep 21 17:39:56 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 0762AECAAD5 for ; Tue, 6 Sep 2022 14:21:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241751AbiIFOVq (ORCPT ); Tue, 6 Sep 2022 10:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241942AbiIFOTE (ORCPT ); Tue, 6 Sep 2022 10:19:04 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A326D72EF8; Tue, 6 Sep 2022 06:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662472210; x=1694008210; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WhGrjx6LzV2jk/LAfomo4zdb3Tdn1LBofxlORU1JDv0=; b=jo8khdHDdPFN+CGj7Ow/ElVWwUJ11vwSf8AIUrgPCTIrlkEOF8CJxPiM mRhII4nJTfS5Jr6BRI8zIxnuKsanZ/eiIZCi5UZcXQwdsOvgvjN476S5b niT4medvkBVW2w/GatGnEqj/xamAqreu0lj/6rCIjZYooh+zMVmO6dMBm Q4l4zWON5cW95dtFJn+za7oTPCIoLxuiSgi+EGPAqXeoXnIoXu5kCp9FW 6hPdLZJ9gHR0ETFJZcd7g8x0hiQUAYtMGprf74cDD9QdLwtyje/9cMvIh 6xxzZrxiVe1rXadROgKSnE36Ox6Z/7tOy4JhqcwaPIylP0BcfMMdYHV3R g==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="276990322" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="276990322" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 06:50:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="614098830" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 06 Sep 2022 06:50:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D6828781; Tue, 6 Sep 2022 16:50:10 +0300 (EEST) From: Andy Shevchenko To: Gene Chen , Andy Shevchenko , Andrew Jeffery , 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: Pavel Machek , Matthias Brugger , Sean Wang , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lee Jones Subject: [PATCH v3 11/11] net: dsa: hellcreek: Get rid of custom led_init_default_state_get() Date: Tue, 6 Sep 2022 16:50:04 +0300 Message-Id: <20220906135004.14885-12-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906135004.14885-1-andriy.shevchenko@linux.intel.com> References: <20220906135004.14885-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