From patchwork Fri Mar 10 16:38:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 67557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp975877wrd; Fri, 10 Mar 2023 08:43:31 -0800 (PST) X-Google-Smtp-Source: AK7set9pIHwFKeTvKIq3l6pKKzJh4PjGT/pXdaHLHLzhGur8Ka1tD7oTezLV0cAyoKEpLCFsp1Qx X-Received: by 2002:a17:90b:4d04:b0:237:47b0:3ea8 with SMTP id mw4-20020a17090b4d0400b0023747b03ea8mr29278607pjb.41.1678466611384; Fri, 10 Mar 2023 08:43:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678466611; cv=none; d=google.com; s=arc-20160816; b=lK/bkIYTNqlzi9W7I0CdnjCAKBhnM+OONvITNRxhwN/QS80wpbW18J1Le0hFpLSwdj 7xue7X8qTwhqzHn67JiUK4iamKpd3wA8ciKf4MBGs9xGHOdXYDXXLVoiyCHZ+J2EuI8L tGuAEnLP3CccTBXMNFRc/a5JPP4/8RiQNNWnvBWIHS1TrRDCHFzYGDA2R7+OX41p/t8/ qwPNeD2Ffio8ZHx5sYOhHkRcnxPkegx8hutLOsRfBDU/JdCqfkG3WUKBm6e7XfUQhIls 83a5wVSUupy7KGcX9aot+MNepUjSr8nEMCcxZRtd+PPz8gK3fin4Ikf4FVGlNBacMg9Y qKTA== 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=5pscJKiXSEbJ+m/N7sYoad8pN5SWvamDiilHYXLfwZU=; b=GYiC/NVpy/6clzkhzEIpy+8TLtpm/B6Q47WMYcBKYZs89dTYYi2sTOjzG66XBwFJA0 tnCSTFgzJyYlZ0OIrdUyvgogPRHV/yZ1wC5CGTHwfAPugulSy2dhItDOPYvl9Ycjgt3X DL6LkyiejgxNbOm+hy74e4lYSjglpccaTUMUEn9THOVvMJ1CYmDq3K+QIk8ANKcOy/4X RV4RQ2H4SBhIXK/XB4eLI6K7vNGgNBnh4tW8BKVZIMxHqQVz1Bv7b2AGusOJrpWpTX93 enV1C0amPHzSZWh+iMm9FGDf1UGUq8xylCnpCbcuIRXtUaoyx9mQubzKRP5/GIntFFFz 9SHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bxH3twfz; 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 w127-20020a636285000000b00502d861f9e5si208198pgb.322.2023.03.10.08.43.18; Fri, 10 Mar 2023 08:43:31 -0800 (PST) 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=bxH3twfz; 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 S231282AbjCJQm6 (ORCPT + 99 others); Fri, 10 Mar 2023 11:42:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjCJQmh (ORCPT ); Fri, 10 Mar 2023 11:42:37 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0E2B3C33; Fri, 10 Mar 2023 08:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678466422; x=1710002422; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xmjvRkk2u1w6wR6YUli7dg1Fh8HG6Z/p1SZNWVWgCDU=; b=bxH3twfzKf58a3MRBumNLFY010XYa7WynZo5kSPjbAlfvsQ8PcMP5vgI 7QfNBHPL2jJ7oOf0jAJmg4ZcZG0xqxpR/qazqyo/lqRmxtf9rPLsiEEcR 9UhHMQlr/5dO5MdsMzttCMatidutUOiV9VO1BnVp6x54+uE/WFtOMxjPv vZyPoKxqa2JCEcJqlYRW98ioWnh6JrpfPi7JJTCHQEqs6+E2773/ts+xL qauniqM6K2TLQLU7RDEn6RmzRF+osj0+KQOWvmDac7TXMUIzn9etpt6jS OW34KI+36731cwpKUh0qqMavgyiZqHy3fYPLoR3Qv2JaNUvW6ta/9t6ib g==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="338322249" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="338322249" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 08:38:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="671144118" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="671144118" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 10 Mar 2023 08:38:14 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 28B06143; Fri, 10 Mar 2023 18:38:57 +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 v5 1/1] net: dsa: hellcreek: Get rid of custom led_init_default_state_get() Date: Fri, 10 Mar 2023 18:38:55 +0200 Message-Id: <20230310163855.21757-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,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?1759999805464983898?= X-GMAIL-MSGID: =?utf-8?q?1759999805464983898?= 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 --- v5: resent after v6.3-rc1 with proper net-next prefix 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..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(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;