From: Dan Carpenter <dan.carpenter@oracle.com>
To: shubhrajyoti.datta@gmail.com
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@driverdev.osuosl.org, mark.rutland@arm.com,
devicetree@vger.kernel.org, sboyd@kernel.org,
gregkh@linuxfoundation.org, mturquette@baylibre.com,
Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>,
robh+dt@kernel.org, soren.brinkmann@xilinx.com
Subject: Re: [PATCH v3 08/10] clk: clock-wizard: Make the output names unique
Date: Thu, 28 Nov 2019 10:45:05 +0300 [thread overview]
Message-ID: <20191128074505.GC1781@kadam> (raw)
In-Reply-To: <d9277db2692bb77a41dfed927cfb791bdcced17d.1574922435.git.shubhrajyoti.datta@xilinx.com>
On Thu, Nov 28, 2019 at 12:06:15PM +0530, shubhrajyoti.datta@gmail.com wrote:
> From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
>
> Incase there are more than one instance of the clocking wizard.
> And if the output name given is the same then the probe fails.
> Fix the same by appending the device name to the output name to
> make it unique.
>
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
> ---
> drivers/clk/clk-xlnx-clock-wizard.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clk/clk-xlnx-clock-wizard.c b/drivers/clk/clk-xlnx-clock-wizard.c
> index 75ea745..9993543 100644
> --- a/drivers/clk/clk-xlnx-clock-wizard.c
> +++ b/drivers/clk/clk-xlnx-clock-wizard.c
> @@ -555,6 +555,9 @@ static int clk_wzrd_probe(struct platform_device *pdev)
> ret = -ENOMEM;
> goto err_disable_clk;
> }
> + outputs = of_property_count_strings(np, "clock-output-names");
> + if (outputs == 1)
> + flags = CLK_SET_RATE_PARENT;
> clk_wzrd->clks_internal[wzrd_clk_mul] = clk_register_fixed_factor
> (&pdev->dev, clk_name,
> __clk_get_name(clk_wzrd->clk_in1),
> @@ -566,9 +569,6 @@ static int clk_wzrd_probe(struct platform_device *pdev)
> goto err_disable_clk;
> }
>
> - outputs = of_property_count_strings(np, "clock-output-names");
> - if (outputs == 1)
> - flags = CLK_SET_RATE_PARENT;
> clk_name = kasprintf(GFP_KERNEL, "%s_mul_div", dev_name(&pdev->dev));
> if (!clk_name) {
> ret = -ENOMEM;
> @@ -591,6 +591,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
> /* register div per output */
> for (i = outputs - 1; i >= 0 ; i--) {
> const char *clkout_name;
> + const char *clkout_name_wiz;
>
> if (of_property_read_string_index(np, "clock-output-names", i,
> &clkout_name)) {
> @@ -599,9 +600,11 @@ static int clk_wzrd_probe(struct platform_device *pdev)
> ret = -EINVAL;
> goto err_rm_int_clks;
> }
> + clkout_name_wiz = kasprintf(GFP_KERNEL, "%s_%s",
> + dev_name(&pdev->dev), clkout_name);
If this kasprintf() crashes then clk_wzrd_register_divf() will fail.
But that was a headache to review. Just add a check for NULL. We need
a kfree() as well.
One alternative would be to just declare a buffer on the stack and use
snprintf(). We don't need to keep the name around after the call to
clk_wzrd_register_divf().
regards,
dan carpenter
next prev parent reply other threads:[~2019-11-28 7:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 6:36 [PATCH v3 00/10] clk: clk-wizard: clock-wizard: Driver updates shubhrajyoti.datta
2019-11-28 6:36 ` [PATCH v3 01/10] dt-bindings: add documentation of xilinx clocking wizard shubhrajyoti.datta
2019-12-13 19:52 ` Rob Herring
2019-11-28 6:36 ` [PATCH v3 02/10] clk: clock-wizard: Move the clockwizard to clk shubhrajyoti.datta
2019-12-13 19:49 ` Rob Herring
2019-11-28 6:36 ` [PATCH v3 03/10] clk: clock-wizard: Fix kernel-doc warning shubhrajyoti.datta
2020-01-05 19:48 ` Stephen Boyd
2019-11-28 6:36 ` [PATCH v3 04/10] clk: clock-wizard: Add support for dynamic reconfiguration shubhrajyoti.datta
2020-01-05 19:54 ` Stephen Boyd
2019-11-28 6:36 ` [PATCH v3 05/10] clk: clock-wizard: Add support for fractional support shubhrajyoti.datta
2019-11-28 6:36 ` [PATCH v3 06/10] clk: clock-wizard: Remove the hardcoding of the clock outputs shubhrajyoti.datta
2020-01-05 19:56 ` Stephen Boyd
2019-11-28 6:36 ` [PATCH v3 07/10] clk: clock-wizard: Update the fixed factor divisors shubhrajyoti.datta
2020-01-05 20:00 ` Stephen Boyd
2020-01-06 4:17 ` Shubhrajyoti Datta
2019-11-28 6:36 ` [PATCH v3 08/10] clk: clock-wizard: Make the output names unique shubhrajyoti.datta
2019-11-28 7:45 ` Dan Carpenter [this message]
2019-11-29 12:07 ` Shubhrajyoti Datta
2019-11-29 19:02 ` Dan Carpenter
2019-11-28 6:36 ` [PATCH v3 09/10] staging: clocking-wizard: Delete the driver from the staging shubhrajyoti.datta
2020-01-05 19:45 ` Stephen Boyd
2019-11-28 6:36 ` [PATCH v3 10/10] clk: clock-wizard: Fix the compilation failure shubhrajyoti.datta
2020-01-05 19:46 ` Stephen Boyd
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=20191128074505.GC1781@kadam \
--to=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=shubhrajyoti.datta@gmail.com \
--cc=shubhrajyoti.datta@xilinx.com \
--cc=soren.brinkmann@xilinx.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).