From: sshtylyov@mvista•com (Sergei Shtylyov)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 5/5] ata/ahci_platform: Add clock framework support
Date: Fri, 20 Apr 2012 22:09:58 +0400 [thread overview]
Message-ID: <4F91A676.9030609@mvista.com> (raw)
In-Reply-To: <CAOh2x=noTa93F_ks3tR0CT5uRfS8=8v=eiY6tStNLV9qzCTB=Q@mail.gmail.com>
Hello.
On 04/20/2012 09:41 PM, viresh kumar wrote:
>>> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
>>> @@ -117,6 +118,20 @@ static int __init ahci_probe(struct platform_device
>>> *pdev)
>>> return -ENOMEM;
>>> }
>>>
>>> +#ifdef CONFIG_HAVE_CLK
>>> + hpriv->clk = clk_get(dev, NULL);
>>> + if (IS_ERR(hpriv->clk)) {
>>> + dev_err(dev, "Clock not found\n");
>>> + return PTR_ERR(hpriv->clk);
>>> + }
>>> +
>>> + rc = clk_prepare_enable(hpriv->clk);
>>> + if (rc) {
>>> + dev_err(dev, "clock prepare enable failed");
>>> + goto free_clk;
>>> + }
>>> +#endif
>>> +
>>> /*
>>> * Some platforms might need to prepare for mmio region access,
>>> * which could be done in the following init call. So, the mmio
>> [...]
>>> @@ -190,12 +205,18 @@ static int __init ahci_probe(struct platform_device
>>> *pdev)
>>> rc = ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
>>> &ahci_platform_sht);
>>> if (rc)
>>> - goto err0;
>>> + goto pdata_exit;
>>>
>>> return 0;
>>> -err0:
>>> +pdata_exit:
>>> if (pdata&& pdata->exit)
>>> pdata->exit(dev);
>>> +disable_unprepare_clk:
>>> +#ifdef CONFIG_HAVE_CLK
>>> + clk_disable_unprepare(hpriv->clk);
>>> +free_clk:
>>> + clk_put(hpriv->clk);
>>> +#endif
>>> return rc;
>>> }
>>>
>>> @@ -204,12 +225,19 @@ static int __devexit ahci_remove(struct
>>> platform_device *pdev)
>>> struct device *dev =&pdev->dev;
>>> struct ahci_platform_data *pdata = dev_get_platdata(dev);
>>> struct ata_host *host = dev_get_drvdata(dev);
>>> +#ifdef CONFIG_HAVE_CLK
>>> + struct ahci_host_priv *hpriv = host->private_data;
>>> +#endif
>>>
>>> ata_host_detach(host);
>>>
>>> if (pdata&& pdata->exit)
>>> pdata->exit(dev);
>>>
>>> +#ifdef CONFIG_HAVE_CLK
>>> + clk_disable_unprepare(hpriv->clk);
>>> + clk_put(hpriv->clk);
>>> +#endif
>>> return 0;
>>> }
>>>
>>> @@ -244,6 +272,11 @@ static int ahci_suspend(struct device *dev)
>>>
>>> if (pdata&& pdata->suspend)
>>> return pdata->suspend(dev);
>>> +
>>> +#ifdef CONFIG_HAVE_CLK
>>> + clk_disable_unprepare(hpriv->clk);
>>> +#endif
>>> +
>>> return 0;
>>> }
>>>
>>> @@ -253,16 +286,26 @@ static int ahci_resume(struct device *dev)
>>> struct ata_host *host = dev_get_drvdata(dev);
>>> int rc;
>>>
>>> +#ifdef CONFIG_HAVE_CLK
>>> + struct ahci_host_priv *hpriv = host->private_data;
>>> +
>>> + rc = clk_prepare_enable(hpriv->clk);
>>> + if (rc) {
>>> + dev_err(dev, "clock prepare enable failed");
>>> + return rc;
>>> + }
>>> +#endif
>>> +
>> [...]
>>> @@ -270,6 +313,12 @@ static int ahci_resume(struct device *dev)
>>> ata_host_resume(host);
>>>
>>> return 0;
>>> +
>>> +disable_unprepare_clk:
>>> +#ifdef CONFIG_HAVE_CLK
>>> + clk_disable_unprepare(hpriv->clk);
>>> +#endif
>> Can't we have empty inlines for !defined(CONFIG_HAVE_CLK) case in
>> <linux/clk.h>. Otherwise there's too much uglye #ifdef'ery.
> Isn't that simple. Lot of platforms defining these routines clk_get(),
> clk_put(), etc.
> So, if we create dummy routines, they will get errors for multiple declarations.
But those platforms should have CONFIG_HAVE_CLK defined...
WBR, Sergei
prev parent reply other threads:[~2012-04-20 18:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1334932338.git.viresh.kumar@st.com>
[not found] ` <8308fd88100d4af942d920d51bf24184fcb33b72.1334932338.git.viresh.kumar@st.com>
[not found] ` <4F91799F.1010002@mvista.com>
2012-04-20 17:41 ` [PATCH 5/5] ata/ahci_platform: Add clock framework support viresh kumar
2012-04-20 18:09 ` Sergei Shtylyov [this message]
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=4F91A676.9030609@mvista.com \
--to=sshtylyov@mvista$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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