From: Jacek Anaszewski <jacek.anaszewski@gmail.com>
To: linux-leds@vger.kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
pavel@ucw.cz, robh@kernel.org, dtor@google.com,
linux@roeck-us.net, jacek.anaszewski@gmail.com,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v4 22/26] leds: as3645a: Use generic support for composing LED names
Date: Wed, 17 Apr 2019 22:54:35 +0200 [thread overview]
Message-ID: <20190417205439.17685-23-jacek.anaszewski@gmail.com> (raw)
In-Reply-To: <20190417205439.17685-1-jacek.anaszewski@gmail.com>
Switch to using generic LED support for composing LED class
device name.
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/leds/leds-as3645a.c | 69 ++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 44 deletions(-)
diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c
index b0df514992e1..52a7426e26d4 100644
--- a/drivers/leds/leds-as3645a.c
+++ b/drivers/leds/leds-as3645a.c
@@ -132,11 +132,6 @@ struct as3645a_config {
u32 peak;
};
-struct as3645a_names {
- char flash[32];
- char indicator[32];
-};
-
struct as3645a {
struct i2c_client *client;
@@ -492,12 +487,10 @@ static int as3645a_detect(struct as3645a *flash)
}
static int as3645a_parse_node(struct as3645a *flash,
- struct as3645a_names *names,
struct fwnode_handle *fwnode)
{
struct as3645a_config *cfg = &flash->cfg;
struct fwnode_handle *child;
- const char *name;
int rval;
fwnode_for_each_child_node(fwnode, child) {
@@ -525,17 +518,6 @@ static int as3645a_parse_node(struct as3645a *flash,
return -ENODEV;
}
- rval = fwnode_property_read_string(flash->flash_node, "label", &name);
- if (!rval) {
- strlcpy(names->flash, name, sizeof(names->flash));
- } else if (is_of_node(fwnode)) {
- snprintf(names->flash, sizeof(names->flash),
- "%pOFn:flash", to_of_node(fwnode));
- } else {
- dev_err(&flash->client->dev, "flash node has no label!\n");
- return -EINVAL;
- }
-
rval = fwnode_property_read_u32(flash->flash_node, "flash-timeout-us",
&cfg->flash_timeout_us);
if (rval < 0) {
@@ -573,17 +555,6 @@ static int as3645a_parse_node(struct as3645a *flash,
goto out_err;
}
- rval = fwnode_property_read_string(flash->indicator_node, "label",
- &name);
- if (!rval) {
- strlcpy(names->indicator, name, sizeof(names->indicator));
- } else if (is_of_node(fwnode)) {
- snprintf(names->indicator, sizeof(names->indicator),
- "%pOFn:indicator", to_of_node(fwnode));
- } else {
- dev_err(&flash->client->dev, "indicator node has no label!\n");
- return -EINVAL;
- }
rval = fwnode_property_read_u32(flash->indicator_node,
"led-max-microamp",
@@ -603,21 +574,25 @@ static int as3645a_parse_node(struct as3645a *flash,
return rval;
}
-static int as3645a_led_class_setup(struct as3645a *flash,
- struct as3645a_names *names)
+static int as3645a_led_class_setup(struct as3645a *flash)
{
struct led_classdev *fled_cdev = &flash->fled.led_cdev;
struct led_classdev *iled_cdev = &flash->iled_cdev;
+ struct led_init_data init_data;
struct led_flash_setting *cfg;
int rval;
- iled_cdev->name = names->indicator;
iled_cdev->brightness_set_blocking = as3645a_set_indicator_brightness;
iled_cdev->max_brightness =
flash->cfg.indicator_max_ua / AS_INDICATOR_INTENSITY_STEP;
iled_cdev->flags = LED_CORE_SUSPENDRESUME;
- rval = led_classdev_register(&flash->client->dev, iled_cdev);
+ init_data.fwnode = flash->indicator_node;
+ init_data.devicename = AS_NAME;
+ init_data.default_label = "indicator";
+
+ rval = led_classdev_register_ext(&flash->client->dev, iled_cdev,
+ &init_data);
if (rval < 0)
return rval;
@@ -635,7 +610,6 @@ static int as3645a_led_class_setup(struct as3645a *flash,
flash->fled.ops = &as3645a_led_flash_ops;
- fled_cdev->name = names->flash;
fled_cdev->brightness_set_blocking = as3645a_set_assist_brightness;
/* Value 0 is off in LED class. */
fled_cdev->max_brightness =
@@ -643,15 +617,23 @@ static int as3645a_led_class_setup(struct as3645a *flash,
flash->cfg.assist_max_ua) + 1;
fled_cdev->flags = LED_DEV_CAP_FLASH | LED_CORE_SUSPENDRESUME;
- rval = led_classdev_flash_register(&flash->client->dev, &flash->fled);
- if (rval) {
- led_classdev_unregister(iled_cdev);
- dev_err(&flash->client->dev,
- "led_classdev_flash_register() failed, error %d\n",
- rval);
- }
+ init_data.fwnode = flash->flash_node;
+ init_data.devicename = AS_NAME;
+ init_data.default_label = "flash";
+
+ rval = led_classdev_flash_register_ext(&flash->client->dev,
+ &flash->fled, &init_data);
+ if (rval)
+ goto out_err;
return rval;
+
+out_err:
+ led_classdev_unregister(iled_cdev);
+ dev_err(&flash->client->dev,
+ "led_classdev_flash_register() failed, error %d\n",
+ rval);
+ return rval;
}
static int as3645a_v4l2_setup(struct as3645a *flash)
@@ -697,7 +679,6 @@ static int as3645a_v4l2_setup(struct as3645a *flash)
static int as3645a_probe(struct i2c_client *client)
{
- struct as3645a_names names;
struct as3645a *flash;
int rval;
@@ -710,7 +691,7 @@ static int as3645a_probe(struct i2c_client *client)
flash->client = client;
- rval = as3645a_parse_node(flash, &names, dev_fwnode(&client->dev));
+ rval = as3645a_parse_node(flash, dev_fwnode(&client->dev));
if (rval < 0)
return rval;
@@ -725,7 +706,7 @@ static int as3645a_probe(struct i2c_client *client)
if (rval)
goto out_mutex_destroy;
- rval = as3645a_led_class_setup(flash, &names);
+ rval = as3645a_led_class_setup(flash);
if (rval)
goto out_mutex_destroy;
--
2.11.0
next prev parent reply other threads:[~2019-04-17 20:56 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 20:54 [PATCH v4 00/26] Add generic support for composing LED class device name Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 01/26] ALSA: line6: Avoid polluting led_* namespace Jacek Anaszewski
2019-04-18 5:17 ` Takashi Iwai
2019-04-18 12:21 ` Pavel Machek
2019-04-18 12:24 ` Takashi Iwai
2019-04-18 17:12 ` Jacek Anaszewski
2019-04-18 18:46 ` Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 02/26] leds: class: Improve LED and LED flash class registration API Jacek Anaszewski
2019-04-24 13:46 ` Pavel Machek
2019-04-24 18:04 ` Jacek Anaszewski
2019-04-24 18:25 ` Pavel Machek
2019-04-24 18:56 ` Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 03/26] dt-bindings: leds: Add LED_FUNCTION definitions Jacek Anaszewski
2019-04-26 18:47 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 04/26] dt-bindings: leds: Add LED_COLOR_ID definitions Jacek Anaszewski
2019-04-24 13:49 ` Pavel Machek
2019-04-24 18:14 ` Jacek Anaszewski
2019-04-26 18:47 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 05/26] dt-bindings: leds: Add properties for LED name construction Jacek Anaszewski
2019-04-26 18:58 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 06/26] leds: core: Add support for composing LED class device names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 07/26] dt-bindings: sc27xx-blt: Add function and color properties Jacek Anaszewski
2019-04-26 18:58 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 08/26] leds: sc27xx-blt: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 09/26] dt-bindings: lt3593: Add function and color properties Jacek Anaszewski
2019-04-26 18:58 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 10/26] leds: lt3593: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 11/26] dt-bindings: lp8860: Add function and color properties Jacek Anaszewski
2019-04-18 12:28 ` Dan Murphy
2019-04-18 17:18 ` Jacek Anaszewski
2019-04-26 18:59 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 12/26] leds: lp8860: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 13/26] dt-bindings: lm3692x: Add function and color properties Jacek Anaszewski
2019-04-26 19:21 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 14/26] leds: lm3692x: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 15/26] dt-bindings: lm36010: Add function and color properties Jacek Anaszewski
2019-04-26 19:21 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 16/26] leds: lm3601x: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 17/26] dt-bindings: cr0014114: Add function and color properties Jacek Anaszewski
2019-04-26 19:22 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 18/26] leds: cr0014114: Use generic support for composing LED names Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 19/26] dt-bindings: aat1290: Add function and color properties Jacek Anaszewski
2019-04-26 19:22 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 20/26] leds: aat1290: Use generic support for composing LED names Jacek Anaszewski
2019-04-24 13:57 ` Pavel Machek
2019-04-24 18:16 ` Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 21/26] dt-bindings: as3645a: Add function and color properties Jacek Anaszewski
2019-04-26 19:23 ` Rob Herring
2019-04-17 20:54 ` Jacek Anaszewski [this message]
2019-04-24 14:01 ` [PATCH v4 22/26] leds: as3645a: Use generic support for composing LED names Pavel Machek
2019-04-24 18:18 ` Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 23/26] dt-bindings: leds-gpio: Add function and color properties Jacek Anaszewski
2019-04-26 19:23 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 24/26] leds: gpio: Use generic support for composing LED names Jacek Anaszewski
2019-04-24 14:04 ` Pavel Machek
2019-04-24 19:02 ` Jacek Anaszewski
2019-04-17 20:54 ` [PATCH v4 25/26] dt-bindings: an30259a: Add function and color properties Jacek Anaszewski
2019-04-26 19:23 ` Rob Herring
2019-04-17 20:54 ` [PATCH v4 26/26] leds: an30259a: Use generic support for composing LED names Jacek Anaszewski
2019-04-24 14:05 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190417205439.17685-23-jacek.anaszewski@gmail.com \
--to=jacek.anaszewski@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dtor@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=pavel@ucw.cz \
--cc=robh@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).