From patchwork Mon Dec 18 20:23:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 122317 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp3178314edb; Mon, 18 Dec 2017 12:23:46 -0800 (PST) X-Google-Smtp-Source: ACJfBotwcM/G77VGtHAZE6CSvw/7UqJn+1tSqawClAyiK3OaCxHkJSSWMesu1IY+V8K4t8LzD9w5 X-Received: by 10.159.218.152 with SMTP id w24mr872833plp.43.1513628626498; Mon, 18 Dec 2017 12:23:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513628626; cv=none; d=google.com; s=arc-20160816; b=UxKsfw4hLudibLpNItOV2lh8fpL7r9IqDjvh2hL1YBtPi+Z8USTB1xZvi5pV6IMm3i xoW+SyIoIPBWEJfYi+Ml2JaU4pnxGAgj5uCgvND3UzKqjxg918Ynf0UXKCaxMaOf9fPM F/dZ/pOo3a8l/d6xxK9GYfN+n/VN3wE0FG0kXlOA8EwiEUabS/9soJNLsOqe3i/onuBA A+RPyI9kSrCCLCeW9NUC+E/xF1nZ37XBlpu6+AhnVTTVm+VwHYwlb19al2tEtT3xLvdn XVHsiJ40ugQ/n9QnupOCU2UKLMM5NpvjgYk4WK9j4ERZHIBxaUCEH/kG1JQBpoeVkUIO jakA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=SQOWcowZNPEEgcAsaLhNVLacpoozSEolgLkSzDYJdQI=; b=Vp7dr027wBA+5uPC0Wa6UmKYCYkR6nUiPoFqahn0LLpWHCijKM/JLqHaROu/GTHuPS jnocGaAIFr0JVqMnbNSJjFxQ3Jbe/HbdtmmVBCK1/3P1fnJ+BJcm8HFuiNVIp2B4ImyC Ka4l+Zvpl5oPgsUDf0M6szDQ/nvRTETl5zVTMNA1WgMWyfPswGLlXBsV8+/PHE4REEcR xd4gZnbhmiBQKtCIqS5WLk6jlBTGNyLQxnypuRT8YOoc+YgsGIcIGiehgih7X4mugNFr YNletp0MDH9eawq0s6vYem0XgJeqnlFAnlkTtJUL2njcO8ZX6rpUjx/JBUIfGygYz8OG 5oNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=cQY+NWQ6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si8630069pgv.360.2017.12.18.12.23.46; Mon, 18 Dec 2017 12:23:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=cQY+NWQ6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760414AbdLRUXm (ORCPT + 28 others); Mon, 18 Dec 2017 15:23:42 -0500 Received: from lelnx193.ext.ti.com ([198.47.27.77]:44562 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758408AbdLRUXg (ORCPT ); Mon, 18 Dec 2017 15:23:36 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id vBIKNGQP003013; Mon, 18 Dec 2017 14:23:16 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1513628596; bh=VVckDxgYw5c7iv0sjQOl/llxXklNfVQ8Oi83rBVXYE4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=cQY+NWQ6odKzXVRvHxRB0GmXb+UBSf5SvDlnAU45ASnGQu2uFoLWFkorc3bZZ01BO j/kpPy8I9ZJPoB6kd0CFxacoFbtD8mZPq4Poo8r/kILZq0ZXFDTlQlNk7Nf6uZbilk r4UjmaAHctLdH6LEuoFwzrBNH3tlyi1BJ1u6t9LY= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBIKNGpI020174; Mon, 18 Dec 2017 14:23:16 -0600 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 18 Dec 2017 14:23:16 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 18 Dec 2017 14:23:16 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBIKNGMn015762; Mon, 18 Dec 2017 14:23:16 -0600 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.68.73]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id vBIKNFx19288; Mon, 18 Dec 2017 14:23:15 -0600 (CST) From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH v5 3/6] leds: lp8860: Update the dt parsing for LED labeling Date: Mon, 18 Dec 2017 14:23:04 -0600 Message-ID: <20171218202307.4913-3-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20171218202307.4913-1-dmurphy@ti.com> References: <20171218202307.4913-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the DT parsing for the label node so that the label is retrieved from the device child as opposed to being part of the parent. This will align this driver with the LED binding documentation Documentation/devicetree/bindings/leds/common.txt Signed-off-by: Dan Murphy --- v5 - no changes v4 - Fix checkpatch warning for code indentation - https://patchwork.kernel.org/patch/10108157/ v3 - Changed the label generation to pull the name from the i2c device id as opposed to pulling the id from the parent dt node since that will just be led-controller - https://patchwork.kernel.org/patch/10093753/ v2 - no changes drivers/leds/leds-lp8860.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.15.0.124.g7668cbc60 diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c index 3e70775a2d54..46578fbc36be 100644 --- a/drivers/leds/leds-lp8860.c +++ b/drivers/leds/leds-lp8860.c @@ -22,6 +22,7 @@ #include #include #include +#include #define LP8860_DISP_CL1_BRT_MSB 0x00 #define LP8860_DISP_CL1_BRT_LSB 0x01 @@ -86,8 +87,6 @@ #define LP8860_CLEAR_FAULTS 0x01 -#define LP8860_DISP_LED_NAME "display_cluster" - /** * struct lp8860_led - * @lock - Lock for reading/writing the device @@ -107,7 +106,7 @@ struct lp8860_led { struct regmap *eeprom_regmap; struct gpio_desc *enable_gpio; struct regulator *regulator; - const char *label; + char label[LED_MAX_NAME_SIZE]; }; struct lp8860_eeprom_reg { @@ -365,19 +364,21 @@ static int lp8860_probe(struct i2c_client *client, int ret; struct lp8860_led *led; struct device_node *np = client->dev.of_node; + struct device_node *child_node; + const char *name; led = devm_kzalloc(&client->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; - led->label = LP8860_DISP_LED_NAME; - - if (client->dev.of_node) { - ret = of_property_read_string(np, "label", &led->label); - if (ret) { - dev_err(&client->dev, "Missing label in dt\n"); - return -EINVAL; - } + for_each_available_child_of_node(np, child_node) { + ret = of_property_read_string(child_node, "label", &name); + if (!ret) + snprintf(led->label, sizeof(led->label), "%s:%s", + id->name, name); + else + snprintf(led->label, sizeof(led->label), + "%s::display_cluster", id->name); } led->enable_gpio = devm_gpiod_get_optional(&client->dev,