On Wed, Feb 19, 2014 at 01:01:46PM +0100, Hans de Goede wrote:
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index 434ab89..aaa0c08 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -87,6 +87,44 @@ static struct scsi_host_template ahci_platform_sht = {
> AHCI_SHT("ahci_platform"),
> };
>
> +
> +int ahci_platform_enable_clks(struct ahci_host_priv *hpriv)
Throughout the series, there are mixtures of one and two blank lines
in front of functions, let's just do one consistently. Also, can you
please add proper function comments on top of the exported functions?
> +{
> + int c, rc;
> +
> + for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++) {
> + rc = clk_prepare_enable(hpriv->clks[c]);
> + if (rc)
> + goto disable_unprepare_clk;
> + }
> + return 0;
> +
> +disable_unprepare_clk:
> + while (--c >= 0)
> + clk_disable_unprepare(hpriv->clks[c]);
> + return rc;
> +}
> +EXPORT_SYMBOL_GPL(ahci_platform_enable_clks);
> +
> +void ahci_platform_disable_clks(struct ahci_host_priv *hpriv)
> +{
> + int c;
> +
> + for (c = AHCI_MAX_CLKS - 1; c >= 0; c--)
> + if (hpriv->clks[c])
> + clk_disable_unprepare(hpriv->clks[c]);
> +}
> +EXPORT_SYMBOL_GPL(ahci_platform_disable_clks);
> +
> +
> +static void ahci_put_clks(struct ahci_host_priv *hpriv)
> +{
> + int c;
> +
> + for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)
> + clk_put(hpriv->clks[c]);
> +}
Urgh, clk can't do devm? ahci_platform itself should be able to build
devmized interface using devres_alloc() or devm_add_action().
Eh.... maybe later.
> @@ -131,17 +167,26 @@ static int ahci_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> - hpriv->clk = clk_get(dev, NULL);
> - if (IS_ERR(hpriv->clk)) {
> - dev_err(dev, "can't get clock\n");
> - } else {
> - rc = clk_prepare_enable(hpriv->clk);
> - if (rc) {
> - dev_err(dev, "clock prepare enable failed");
> - goto free_clk;
> + max_clk = dev->of_node ? AHCI_MAX_CLKS : 1;
> + for (i = 0; i < max_clk; i++) {
> + if (i == 0)
> + clk = clk_get(dev, NULL); /* For old platform init */
> + else
> + clk = of_clk_get(dev->of_node, i);
> +
> + if (IS_ERR(clk)) {
> + rc = PTR_ERR(clk);
> + if (rc == -EPROBE_DEFER)
> + goto free_clk;
> + break;
> }
> + hpriv->clks[i] = clk;
> }
Wouldn't it be nice to have some eplanation on why clk init path
diverges depending on whether dev->of_node is NULL or not? In
general, the patchset seems dearth on comment side.
Thanks.
--
tejun
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
