Convert from OF api to fwnode API, so that it is possible to bind this
driver without device-tree.
The fwnode API does not expose a function to read a specific element of
an array. We therefore change the types of the ns2_led_modval structure
so that we can read the whole modval array with one fwnode call.
Signed-off-by: Marek Behún <kabel@xxxxxxxxxx>
Cc: Simon Guinot <simon.guinot@xxxxxxxxxxxx>
---
drivers/leds/leds-ns2.c | 60 ++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 030f426af3d75..427b5059206a5 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -24,11 +24,16 @@ enum ns2_led_modes {
NS_V2_LED_SATA,
};
+/*
+ * If the size of this structure or types of its members is changed,
+ * the filling of array modval in function ns2_led_register must be changed
+ * accordingly.
+ */
struct ns2_led_modval {
- enum ns2_led_modes mode;
- int cmd_level;
- int slow_level;
-};
+ u32 mode;
+ u32 cmd_level;
+ u32 slow_level;
+} __packed;
/*
* The Network Space v2 dual-GPIO LED is wired to a CPLD. Three different LED
@@ -167,30 +172,32 @@ static struct attribute *ns2_led_attrs[] = {
};
ATTRIBUTE_GROUPS(ns2_led);
-static int ns2_led_register(struct device *dev, struct device_node *np,
+static int ns2_led_register(struct device *dev, struct fwnode_handle *node,
struct ns2_led *led)
{
struct led_init_data init_data = {};
struct ns2_led_modval *modval;
enum ns2_led_modes mode;
- int nmodes, ret, i;
+ int nmodes, ret;
- led->cmd = devm_gpiod_get_from_of_node(dev, np, "cmd-gpio", 0,
- GPIOD_ASIS, np->name);
+ led->cmd = devm_fwnode_gpiod_get_index(dev, node, "cmd-gpio", 0,
+ GPIOD_ASIS,
+ fwnode_get_name(node));
if (IS_ERR(led->cmd))
return PTR_ERR(led->cmd);
- led->slow = devm_gpiod_get_from_of_node(dev, np, "slow-gpio", 0,
- GPIOD_ASIS, np->name);
+ led->slow = devm_fwnode_gpiod_get_index(dev, node, "slow-gpio", 0,
+ GPIOD_ASIS,
+ fwnode_get_name(node));
if (IS_ERR(led->slow))
return PTR_ERR(led->slow);
- of_property_read_string(np, "linux,default-trigger",
- &led->cdev.default_trigger);
+ fwnode_property_read_string(node, "linux,default-trigger",
+ &led->cdev.default_trigger);
- ret = of_property_count_u32_elems(np, "modes-map");
+ ret = fwnode_property_count_u32(node, "modes-map");
if (ret < 0 || ret % 3) {
- dev_err(dev, "Missing or malformed modes-map for %pOF\n", np);
+ dev_err(dev, "Missing or malformed modes-map for %pfw\n", node);
return -EINVAL;
}
@@ -199,16 +206,8 @@ static int ns2_led_register(struct device *dev, struct device_node *np,
if (!modval)
return -ENOMEM;
- for (i = 0; i < nmodes; i++) {
- u32 val;
-
- of_property_read_u32_index(np, "modes-map", 3 * i, &val);
- modval[i].mode = val;
- of_property_read_u32_index(np, "modes-map", 3 * i + 1, &val);
- modval[i].cmd_level = val;
- of_property_read_u32_index(np, "modes-map", 3 * i + 2, &val);
- modval[i].slow_level = val;
- }
+ fwnode_property_read_u32_array(node, "modes-map", (void *)modval,
+ nmodes * 3);
rwlock_init(&led->rw_lock);
@@ -231,11 +230,11 @@ static int ns2_led_register(struct device *dev, struct device_node *np,
led->sata = (mode == NS_V2_LED_SATA) ? 1 : 0;
led->cdev.brightness = (mode == NS_V2_LED_OFF) ? LED_OFF : LED_FULL;
- init_data.fwnode = of_fwnode_handle(np);
+ init_data.fwnode = node;
ret = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
if (ret)
- dev_err(dev, "Failed to register LED for node %pOF\n", np);
+ dev_err(dev, "Failed to register LED for node %pfw\n", node);
return ret;
}
@@ -249,13 +248,12 @@ MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
static int ns2_led_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct device_node *np, *child;
+ struct fwnode_handle *child;
struct ns2_led *leds;
int count;
int ret;
- np = dev_of_node(dev);
- count = of_get_available_child_count(np);
+ count = device_get_child_node_count(dev);
if (!count)
return -ENODEV;
@@ -263,10 +261,10 @@ static int ns2_led_probe(struct platform_device *pdev)
if (!leds)
return -ENOMEM;
- for_each_available_child_of_node(np, child) {
+ device_for_each_child_node(dev, child) {
ret = ns2_led_register(dev, child, leds++);
if (ret) {
- of_node_put(child);
+ fwnode_handle_put(child);
return ret;
}
}
--
2.26.2
