From patchwork Sat Sep 19 22:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 255367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CCB0C4361C for ; Sat, 19 Sep 2020 22:15:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4459C2084C for ; Sat, 19 Sep 2020 22:15:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nic.cz header.i=@nic.cz header.b="P81QVNtb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726617AbgISWPz (ORCPT ); Sat, 19 Sep 2020 18:15:55 -0400 Received: from lists.nic.cz ([217.31.204.67]:50122 "EHLO mail.nic.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgISWPz (ORCPT ); Sat, 19 Sep 2020 18:15:55 -0400 Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:cac7:3539:7f1f:463]) by mail.nic.cz (Postfix) with ESMTP id 1BD4A140A9E; Sun, 20 Sep 2020 00:15:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1600553752; bh=NB5LiiD9QW3rkQMR/lNEjPEXNmou7qEgsAqeLCDs/T4=; h=From:To:Date; b=P81QVNtb1gfvpYbq8B9N4MEYhXtEPwepkRuGOmvBhFSb+c/uihE7z627EFmd7ugE7 iyW6JMlkB0tdvtVOGCGvmonGbZ/C6F9mdoNUCM9s/hiRA3eru8I4ZrceDo5qgJ307m pSxaedIWbNgTT3jvU8qx2LQhdp5kz/UEK/HMq0aM= From: =?utf-8?q?Marek_Beh=C3=BAn?= To: linux-leds@vger.kernel.org Cc: Pavel Machek , Dan Murphy , =?utf-8?q?Ma?= =?utf-8?q?rek_Beh=C3=BAn?= , NeilBrown , Linus Walleij , "H . Nikolaus Schaller" Subject: [PATCH leds + devicetree 13/13] leds: tca6507: use struct led_init_data when registering Date: Sun, 20 Sep 2020 00:15:48 +0200 Message-Id: <20200919221548.29984-14-marek.behun@nic.cz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919221548.29984-1-marek.behun@nic.cz> References: <20200919221548.29984-1-marek.behun@nic.cz> MIME-Version: 1.0 X-Spamd-Bar: / X-Virus-Scanned: clamav-milter 0.102.2 at mail X-Virus-Status: Clean Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org By using struct led_init_data when registering we do not need to parse `label` nor `linux,default-trigger` DT property. Moreover `label` is deprecated and if it is not present but `color` and `function` are, LED core will compose a name from these properties instead. Signed-off-by: Marek Behún Cc: NeilBrown Cc: Linus Walleij Cc: H. Nikolaus Schaller --- drivers/leds/leds-tca6507.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c index ad4af6b6e94c7..362dc9b3d97d0 100644 --- a/drivers/leds/leds-tca6507.c +++ b/drivers/leds/leds-tca6507.c @@ -654,6 +654,7 @@ static int tca6507_register_leds_and_gpios(struct device *dev, return -EINVAL; device_for_each_child_node(dev, child) { + struct led_init_data init_data = {}; struct tca6507_led *led; u32 reg; @@ -679,18 +680,14 @@ static int tca6507_register_leds_and_gpios(struct device *dev, led = &tca->leds[reg]; led->chip = tca; led->num = reg; - - if (fwnode_property_read_string(child, "label", - &led->led_cdev.name)) - led->led_cdev.name = fwnode_get_name(child); - - fwnode_property_read_string(child, "linux,default-trigger", - &led->led_cdev.default_trigger); - + led->bank = -1; led->led_cdev.brightness_set = tca6507_brightness_set; led->led_cdev.blink_set = tca6507_blink_set; - led->bank = -1; - ret = devm_led_classdev_register(dev, &led->led_cdev); + + init_data.fwnode = child; + + ret = devm_led_classdev_register_ext(dev, &led->led_cdev, + &init_data); if (ret) { dev_err(dev, "Failed to register LED for node %pfw\n", child);