From patchwork Tue Mar 14 18:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 69758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1918314wrd; Tue, 14 Mar 2023 11:32:06 -0700 (PDT) X-Google-Smtp-Source: AK7set9qg2haBFNOL2V1pqMFqpduE5CMtxcDbq/cXq0+Psgoeg2lyC9LMQH81sD6eR1ZyAjAvH6/ X-Received: by 2002:a05:6a20:9f98:b0:d5:73ad:87c2 with SMTP id mm24-20020a056a209f9800b000d573ad87c2mr2796374pzb.56.1678818726706; Tue, 14 Mar 2023 11:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678818726; cv=none; d=google.com; s=arc-20160816; b=LQKTeG5VYjqBYKIXwVK9iQ2Zys8UHvHXARgl2iVu57hx58IBFNbMas4m9z0WR74wRn VzFKv51vT07Kl1dU+NHlAdTGW13NilkPNxrdZYViySJQTUuVKWqgdi9ISI5rPok/QoG3 z/oVv1EiJjcmXQXUpoE7H19hlZRdxBSHxB+kTAyAgp1s/21KpM2IlYjJacNeGnugKtLn q7xhlX7HgVefqPWOmpUYciBSrELHbau1tRnzZCZTGLsRVIGCEkti4DztgkpUiW+QbcT2 1POh6gy1yxd+C+w4MVbAlfa9jXu5PYr/ONcy201wzHwClNND6l7oyw2cYxN6EWTXAViN N9cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=0aDjC5Z9WSbWZlGjpWPiHdazegXI5zfL4yeruUtZDiY=; b=jC/V6SwSpI4eeRrvreDyRRYfw/L3DXQmDKP7+56OshqzXfBz4EkwVxwM3+j4ivbWPQ ilinN6gjkVcVqM1Ve9DJ5W4n6T2zP62TItlwOECldDTFpDibMoYa0433RenjgIbBYt6X fblWErGvVKcpkHQ7bw5I/iVdrQbwaWVKgNx4t8ASXb3f7uUMEbD9brSns98yjh3aMy8J 4YfowZi/eotJPSrgPdggzntODF8451Ne0EraJCyHEgqB2b8dpa/qKIRq7WsHNgdPDCuc HDtKlQi8Ya8yyi93xoeOZcPQDyjOojqJ99jXZMQMVrJt/kvMr4v/TLAXA/MYWxsHCFp4 XTmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KeE9vMQU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w125-20020a626283000000b005a8d979fb49si2651736pfb.98.2023.03.14.11.31.51; Tue, 14 Mar 2023 11:32:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KeE9vMQU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229962AbjCNSRw (ORCPT + 99 others); Tue, 14 Mar 2023 14:17:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjCNSRu (ORCPT ); Tue, 14 Mar 2023 14:17:50 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6F2BA54D7; Tue, 14 Mar 2023 11:17: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=1678817865; x=1710353865; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=OenIRImHde+pgXvezYAFpYZp8WM0xB5xrRiHzQkLkXs=; b=KeE9vMQUKpYbFDIpSa/iwK+DRbZcQQl6NtVe8aAROBhTjvAAw1A/hdio 6KTwnWAiAskvwtDZDb/VReHVyhnWA/5HxIhPgVNxHLJojJoMQZjlqg30R +ktpRpGB4gIK9qxsWrstB5/2q/0Y4F6hkFPsRZaIMKSCkyimr6V21pu9q h60SfvmwTetPAVVwG08hJo8x40WdJpi7aQoi0J6OcTmDnjw/VcXCIJRcm k+dfZBQ5mCvUn+5j8pujr7MKDf3/I8KshivAl9KxibRCX8GKV1KbOm6IB LQ+JuzDjFr/bEjmW5Nq4U2PnC+a40sLMUCdEEh/KV+cQUm3btfY+sS++T Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="317158372" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="317158372" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 11:17:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="748103333" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="748103333" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 14 Mar 2023 11:17:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 64AD8163; Tue, 14 Mar 2023 20:18:27 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kurt Kanzenbach , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v6 1/1] net: dsa: hellcreek: Get rid of custom led_init_default_state_get() Date: Tue, 14 Mar 2023 20:18:24 +0200 Message-Id: <20230314181824.56881-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760369025025062657?= X-GMAIL-MSGID: =?utf-8?q?1760369025025062657?= 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 Reviewed-by: Michal Swiatkowski --- v6: wrapped long lines (Simon, Jakub) 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/hirschmann/hellcreek_ptp.c index b28baab6d56a..3e44ccb7db84 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(struct led_classdev *ldev) static int hellcreek_led_setup(struct hellcreek *hellcreek) { struct device_node *leds, *led = NULL; - const char *label, *state; + enum led_default_state state; + const char *label; int ret = -EINVAL; of_node_get(hellcreek->dev->of_node); @@ -318,16 +319,17 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek) ret = of_property_read_string(led, "label", &label); hellcreek->led_sync_good.name = ret ? "sync_good" : label; - ret = of_property_read_string(led, "default-state", &state); - if (!ret) { - if (!strcmp(state, "on")) - hellcreek->led_sync_good.brightness = 1; - else if (!strcmp(state, "off")) - hellcreek->led_sync_good.brightness = 0; - else if (!strcmp(state, "keep")) - hellcreek->led_sync_good.brightness = - hellcreek_get_brightness(hellcreek, - STATUS_OUT_SYNC_GOOD); + state = led_init_default_state_get(of_fwnode_handle(led)); + switch (state) { + case LEDS_DEFSTATE_ON: + hellcreek->led_sync_good.brightness = 1; + break; + case LEDS_DEFSTATE_KEEP: + hellcreek->led_sync_good.brightness = + hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD); + break; + default: + hellcreek->led_sync_good.brightness = 0; } hellcreek->led_sync_good.max_brightness = 1; @@ -344,16 +346,17 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek) ret = of_property_read_string(led, "label", &label); hellcreek->led_is_gm.name = ret ? "is_gm" : label; - ret = of_property_read_string(led, "default-state", &state); - if (!ret) { - if (!strcmp(state, "on")) - hellcreek->led_is_gm.brightness = 1; - else if (!strcmp(state, "off")) - hellcreek->led_is_gm.brightness = 0; - else if (!strcmp(state, "keep")) - hellcreek->led_is_gm.brightness = - hellcreek_get_brightness(hellcreek, - STATUS_OUT_IS_GM); + state = led_init_default_state_get(of_fwnode_handle(led)); + switch (state) { + case LEDS_DEFSTATE_ON: + hellcreek->led_is_gm.brightness = 1; + break; + case LEDS_DEFSTATE_KEEP: + hellcreek->led_is_gm.brightness = + hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM); + break; + default: + hellcreek->led_is_gm.brightness = 0; } hellcreek->led_is_gm.max_brightness = 1;