From patchwork Mon Dec 4 21:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 120595 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1380037edb; Mon, 4 Dec 2017 13:21:21 -0800 (PST) X-Google-Smtp-Source: AGs4zMYwHo8ajqGMF9UnAICPjU9Q7ptKCoij4G4NwObkXZHAs1o8f5yqvAT9nz7jFZ1nREDiror0 X-Received: by 10.84.132.40 with SMTP id 37mr16135626ple.246.1512422481113; Mon, 04 Dec 2017 13:21:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512422481; cv=none; d=google.com; s=arc-20160816; b=xApWI2R6dMOj1yQFFVCN6GrUv+xqF94FzUdt/tuXzfFXdQNNWAn3GD67WrN4xLG8+x Vkm0ZoO6LpvGSL7R5vGNv9RseHPg7X8RbNYw1G5InI4Ag1CR/Lozqmzqj/B388UIn6Je KoDEoxjrESD1r3aMLwQmyLAPBsvoAOaY4gpXtyjfF8+qBfTtse3vT665sWpSafp5ldCj fLnDyiyGqre72cUmUnfb5cBXDPethvnck0uXpBvlacqEbx/+czrBEuTQlZkFGn6zxwQi a8156M5YXbZYTGk0Z4Vhbytgaq5I8dtKDHzfKqtt0Vtms1xU6HU+DK6AGm3sDXIohPpg plLQ== 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=pJQWWZ3oFw9swEViW/q0eIQ4mG84fE2o7JcvzKQ7UGM=; b=Vq6K0mmvshqet6Wv1hI+OEcEBmqla0cRx/2su2FEcFQmeJu2ehbXx5Z84BGYWebZ6V 6xNhMOgikCKclF6YsiKUdKWfTdbgCGqixse1yxKcTj7BVP/TbK9mBk6wB6Iuvcs/gOVC mGUZmVBA0psU9VtEAQQjZNDrCvKGUCOC5YD6d8NsW9QTSvOsuUtJmjcHCaft3FlF2SoJ MBgrQ1U+FFfi7tYsBTaVwpwuCBJmquVYC2QFiu1V7YN7hdDuQxAst7D7temz6gYkUIGc j6mPYCuhVdcrV3xwGMlrkHWQhIaqb+9XAFsqhKWA4wwUfXeyhS7H+V0qN4tLVZYFtgWO kr5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Fc9sHZ3X; 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 y34si10309802plb.377.2017.12.04.13.21.20; Mon, 04 Dec 2017 13:21:21 -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=Fc9sHZ3X; 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 S1752670AbdLDVUx (ORCPT + 28 others); Mon, 4 Dec 2017 16:20:53 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:16897 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752506AbdLDVUr (ORCPT ); Mon, 4 Dec 2017 16:20:47 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id vB4LKVIh014323; Mon, 4 Dec 2017 15:20:31 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1512422431; bh=KCMIwXPnZiAMYMtfyt7zEzA8ebulcfT+1av5AmtXBr8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Fc9sHZ3X0m7vFYogHwkPuB6NxKP/20ODXxG2UdX0qMufB/Agxv+GLxXsVm1BcnELS gDTtLDOHYUQ1lJHJwawydyc8UgCEtkZbK/yoBnYZBNVrLR0Mpuv/Zpvpg+WunoGpJ+ 32M3+6Ozk0XuWidfXPLL1oDrPNG1fgLa2j1Ypy9w= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id vB4LKVJY017161; Mon, 4 Dec 2017 15:20:31 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Mon, 4 Dec 2017 15:20:30 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Mon, 4 Dec 2017 15:20:30 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id vB4LKUQa005442; Mon, 4 Dec 2017 15:20:30 -0600 Received: from localhost (a0272616local-lt.dhcp.ti.com [172.22.83.187]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id vB4LKU323347; Mon, 4 Dec 2017 15:20:30 -0600 (CST) From: Dan Murphy To: , , , , CC: , , Dan Murphy Subject: [PATCH 5/5] leds: lp8860: Various fixes to align with LED framework Date: Mon, 4 Dec 2017 15:20:26 -0600 Message-ID: <20171204212026.14214-6-dmurphy@ti.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20171204212026.14214-1-dmurphy@ti.com> References: <20171204212026.14214-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 driver to conform with the LED framework. Use devm_led_classdev_register Destroy mutex on exit Remove dependency on CONFIG_OF in the driver and move to the Kconfig Update the MODULE_LICENSE to GPL v2 Remove setting of MAX brightness as the LED framework does this. Signed-off-by: Dan Murphy --- drivers/leds/Kconfig | 2 +- drivers/leds/leds-lp8860.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) -- 2.15.0.124.g7668cbc60 diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 318a28fd58fe..ac4d9d8bf96b 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -347,7 +347,7 @@ config LEDS_LP8788 config LEDS_LP8860 tristate "LED support for the TI LP8860 4 channel LED driver" - depends on LEDS_CLASS && I2C + depends on LEDS_CLASS && I2C && OF select REGMAP_I2C help If you say yes here you get support for the TI LP8860 4 channel diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c index 4fed603ee728..e94041e0e693 100644 --- a/drivers/leds/leds-lp8860.c +++ b/drivers/leds/leds-lp8860.c @@ -399,7 +399,6 @@ static int lp8860_probe(struct i2c_client *client, led->client = client; led->led_dev.name = led->label; - led->led_dev.max_brightness = LED_FULL; led->led_dev.brightness_set_blocking = lp8860_brightness_set; mutex_init(&led->lock); @@ -426,7 +425,7 @@ static int lp8860_probe(struct i2c_client *client, if (ret) return ret; - ret = led_classdev_register(&client->dev, &led->led_dev); + ret = devm_led_classdev_register(&client->dev, &led->led_dev); if (ret) { dev_err(&client->dev, "led register err: %d\n", ret); return ret; @@ -440,8 +439,6 @@ static int lp8860_remove(struct i2c_client *client) struct lp8860_led *led = i2c_get_clientdata(client); int ret; - led_classdev_unregister(&led->led_dev); - if (led->enable_gpio) gpiod_direction_output(led->enable_gpio, 0); @@ -452,6 +449,8 @@ static int lp8860_remove(struct i2c_client *client) "Failed to disable regulator\n"); } + mutex_destroy(&led->lock); + return 0; } @@ -461,18 +460,16 @@ static const struct i2c_device_id lp8860_id[] = { }; MODULE_DEVICE_TABLE(i2c, lp8860_id); -#ifdef CONFIG_OF static const struct of_device_id of_lp8860_leds_match[] = { { .compatible = "ti,lp8860", }, {}, }; MODULE_DEVICE_TABLE(of, of_lp8860_leds_match); -#endif static struct i2c_driver lp8860_driver = { .driver = { .name = "lp8860", - .of_match_table = of_match_ptr(of_lp8860_leds_match), + .of_match_table = of_lp8860_leds_match, }, .probe = lp8860_probe, .remove = lp8860_remove, @@ -482,4 +479,4 @@ module_i2c_driver(lp8860_driver); MODULE_DESCRIPTION("Texas Instruments LP8860 LED driver"); MODULE_AUTHOR("Dan Murphy "); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2");