Skip to contentSkip to conversation

clk: Allow clk_get_by_name() with NULL name

PATCH Superseded Samuel Holland 3 participants 6 messages Nov 28, 2022 – Jan 4, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 clk: Allow clk_get_by_name() with NULL name

This allows devm_clock_get(dev, NULL) to work and get the first clock, which is common in code ported from Linux.

---

 drivers/clk/clk-uclass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/clk-uclass.c +3 -2
index 2f9635524cf..bfacafb2eef 100644
@@ -399,13 +399,14 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 
 int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk)
 {
-	int index;
+	int index = 0;
 
 	debug("%s(node=%p, name=%s, clk=%p)\n", __func__,
 		ofnode_get_name(node), name, clk);
 	clk->dev = NULL;
 
-	index = ofnode_stringlist_search(node, "clock-names", name);
+	if (name)
+		index = ofnode_stringlist_search(node, "clock-names", name);
 	if (index < 0) {
 		debug("fdt_stringlist_search() failed: %d\n", index);
 		return index;
Signature · 1 line
2.37.4
#1 lore raw

PATCH 2/2 reset: Allow reset_get_by_name() with NULL name

This allows devm_reset_control_get(dev, NULL) to work and get the first reset control, which is common in code ported from Linux.

---

 drivers/reset/reset-uclass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/reset/reset-uclass.c +3 -2
index bcef46039c2..a26c623a77e 100644
@@ -147,13 +147,14 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk)
 int reset_get_by_name(struct udevice *dev, const char *name,
 		     struct reset_ctl *reset_ctl)
 {
-	int index;
+	int index = 0;
 
 	debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name,
 	      reset_ctl);
 	reset_ctl->dev = NULL;
 
-	index = dev_read_stringlist_search(dev, "reset-names", name);
+	if (name)
+		index = dev_read_stringlist_search(dev, "reset-names", name);
 	if (index < 0) {
 		debug("fdt_stringlist_search() failed: %d\n", index);
 		return index;
Signature · 1 line
2.37.4
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] reset: Allow reset_get_by_name() with NULL name

Quoted 20 lines · Samuel Holland

This allows devm_reset_control_get(dev, NULL) to work and get the first reset control, which is common in code ported from Linux.

---

  drivers/reset/reset-uclass.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/reset/reset-uclass.c +1 -1
index bcef46039c2..a26c623a77e 100644
@@ -147,13 +147,14 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk)
  int reset_get_by_name(struct udevice *dev, const char *name,
  		     struct reset_ctl *reset_ctl)
  {
-	int index;
+	int index = 0;
 

drivers/reset/reset-uclass.c int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk) · line 160

Quoted 10 lines
drivers/reset/reset-uclass.c +2 -1
  	debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name,
  	      reset_ctl);
  	reset_ctl->dev = NULL;
 
-	index = dev_read_stringlist_search(dev, "reset-names", name);
+	if (name)
+		index = dev_read_stringlist_search(dev, "reset-names", name);
  	if (index < 0) {
  		debug("fdt_stringlist_search() failed: %d\n", index);
  		return index;
#3 lore raw

Re: [PATCH 2/2] reset: Allow reset_get_by_name() with NULL name

In reply to Samuel Holland

Hi Samuel,

Quoted 21 lines · Samuel Holland

This allows devm_reset_control_get(dev, NULL) to work and get the first reset control, which is common in code ported from Linux.

---

 drivers/reset/reset-uclass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/reset/reset-uclass.c +1 -1
index bcef46039c2..a26c623a77e 100644
@@ -147,13 +147,14 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk)
 int reset_get_by_name(struct udevice *dev, const char *name,
                     struct reset_ctl *reset_ctl)
 {
-       int index;
+       int index = 0;
 

drivers/reset/reset-uclass.c int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk) · line 160

Quoted 10 lines
drivers/reset/reset-uclass.c +2 -1
        debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name,
              reset_ctl);
        reset_ctl->dev = NULL;
 
-       index = dev_read_stringlist_search(dev, "reset-names", name);
+       if (name)
+               index = dev_read_stringlist_search(dev, "reset-names", name);
        if (index < 0) {
                debug("fdt_stringlist_search() failed: %d\n", index);
                return index;

The above three lines should only be used when name is NULL.

Quoted 3 lines

--
2.37.4

Please update the function comment in the header file and add a test for this to test/dm/reset.c

Regards,
Simon

Reviewed-by on v1 1/2
#4 lore raw
In reply to Samuel Holland
Quoted 1 line · Samuel Holland

This allows devm_clock_get(dev, NULL) to work and get the first clock,

nit: devm_clk_get

Quoted 19 lines

which is common in code ported from Linux.

---

  drivers/clk/clk-uclass.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/clk-uclass.c +1 -1
index 2f9635524cf..bfacafb2eef 100644
@@ -399,13 +399,14 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 
  int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk)
  {
-	int index;
+	int index = 0;
 

drivers/clk/clk-uclass.c int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk) · line 412

Quoted 10 lines
drivers/clk/clk-uclass.c +2 -1
  	debug("%s(node=%p, name=%s, clk=%p)\n", __func__,
  		ofnode_get_name(node), name, clk);
  	clk->dev = NULL;
 
-	index = ofnode_stringlist_search(node, "clock-names", name);
+	if (name)
+		index = ofnode_stringlist_search(node, "clock-names", name);
  	if (index < 0) {
  		debug("fdt_stringlist_search() failed: %d\n", index);
  		return index;
#5 lore raw
In reply to Samuel Holland

Hi Samuel,

Quoted 32 lines · Samuel Holland

This allows devm_clock_get(dev, NULL) to work and get the first clock, which is common in code ported from Linux.

---

 drivers/clk/clk-uclass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/clk-uclass.c +3 -3
index 2f9635524cf..bfacafb2eef 100644
@@ -399,13 +399,14 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
 
 int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk)
 {
-       int index;
+       int index = 0;
 
        debug("%s(node=%p, name=%s, clk=%p)\n", __func__,
                ofnode_get_name(node), name, clk);
        clk->dev = NULL;
 
-       index = ofnode_stringlist_search(node, "clock-names", name);
+       if (name)
+               index = ofnode_stringlist_search(node, "clock-names", name);
        if (index < 0) {
                debug("fdt_stringlist_search() failed: %d\n", index);
                return index;
--
Quoted 2 lines

2.37.4

Same comments as for the reset patch.

Regards,
Simon