Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1bdfbaf authored by Julia Lawall's avatar Julia Lawall Committed by Stephen Boyd
Browse files

clk: si5351: add missing of_node_put 

for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.

A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr

):

// <smpl>
@@
expression root,e;
local idexpression child;
@@

 for_each_child_of_node(root, child) {
   ... when != of_node_put(child)
       when != e = child
(
   return child;
|
+  of_node_put(child);
?  return ...;
)
   ...
 }
// </smpl>

The resulting puts were manually moved to the end of the function for
conciseness.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 6bc9d9d6

drivers/clk/clk-si5351.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -1183,13 +1183,13 @@ static int si5351_dt_parse(struct i2c_client *client, 
		if (of_property_read_u32(child, "reg", &num)) {

		if (of_property_read_u32(child, "reg", &num)) {

			dev_err(&client->dev, "missing reg property of %s\n",

			dev_err(&client->dev, "missing reg property of %s\n",

				child->name);

				child->name);

			return -EINVAL;

			goto put_child;

		}

		}





		if (num >= 8 ||

		if (num >= 8 ||

		    (variant == SI5351_VARIANT_A3 && num >= 3)) {

		    (variant == SI5351_VARIANT_A3 && num >= 3)) {

			dev_err(&client->dev, "invalid clkout %d\n", num);

			dev_err(&client->dev, "invalid clkout %d\n", num);

			return -EINVAL;

			goto put_child;

		}

		}





		if (!of_property_read_u32(child, "silabs,multisynth-source",

		if (!of_property_read_u32(child, "silabs,multisynth-source",
@@ -1207,7 +1207,7 @@ static int si5351_dt_parse(struct i2c_client *client, 
				dev_err(&client->dev,

				dev_err(&client->dev,

					"invalid parent %d for multisynth %d\n",

					"invalid parent %d for multisynth %d\n",

					val, num);

					val, num);

				return -EINVAL;

				goto put_child;

			}

			}

		}

		}
@@ -1230,7 +1230,7 @@ static int si5351_dt_parse(struct i2c_client *client, 
					dev_err(&client->dev,

					dev_err(&client->dev,

						"invalid parent %d for clkout %d\n",

						"invalid parent %d for clkout %d\n",

						val, num);

						val, num);

					return -EINVAL;

					goto put_child;

				}

				}

				pdata->clkout[num].clkout_src =

				pdata->clkout[num].clkout_src =

					SI5351_CLKOUT_SRC_CLKIN;

					SI5351_CLKOUT_SRC_CLKIN;
@@ -1239,7 +1239,7 @@ static int si5351_dt_parse(struct i2c_client *client, 
				dev_err(&client->dev,

				dev_err(&client->dev,

					"invalid parent %d for clkout %d\n",

					"invalid parent %d for clkout %d\n",

					val, num);

					val, num);

				return -EINVAL;

				goto put_child;

			}

			}

		}

		}
@@ -1256,7 +1256,7 @@ static int si5351_dt_parse(struct i2c_client *client, 
				dev_err(&client->dev,

				dev_err(&client->dev,

					"invalid drive strength %d for clkout %d\n",

					"invalid drive strength %d for clkout %d\n",

					val, num);

					val, num);

				return -EINVAL;

				goto put_child;

			}

			}

		}

		}
@@ -1283,7 +1283,7 @@ static int si5351_dt_parse(struct i2c_client *client, 
				dev_err(&client->dev,

				dev_err(&client->dev,

					"invalid disable state %d for clkout %d\n",

					"invalid disable state %d for clkout %d\n",

					val, num);

					val, num);

				return -EINVAL;

				goto put_child;

			}

			}

		}

		}
@@ -1296,6 +1296,9 @@ static int si5351_dt_parse(struct i2c_client *client, 
	client->dev.platform_data = pdata;

	client->dev.platform_data = pdata;





	return 0;

	return 0;

put_child:

	of_node_put(child);

	return -EINVAL;

}

}

#else

#else

static int si5351_dt_parse(struct i2c_client *client, enum si5351_variant variant)

static int si5351_dt_parse(struct i2c_client *client, enum si5351_variant variant)