From: Jose Abreu <Jose.Abreu@synopsys.com>
To: alsa-devel@alsa-project.org
Cc: Jose Abreu <Jose.Abreu@synopsys.com>,
Carlos Palminha <CARLOS.PALMINHA@synopsys.com>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Rob Herring <robh@kernel.org>,
Alexey Brodkin <Alexey.Brodkin@synopsys.com>,
linux-snps-arc@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/4 v7] ASoC: dwc: Do not use devm_clk_get() if using platform data
Date: Mon, 23 May 2016 11:02:23 +0100 [thread overview]
Message-ID: <d288d87fc0f1c07f4d301dc08d32b1bf9915446c.1463996627.git.joabreu@synopsys.com> (raw)
In-Reply-To: <cover.1463996627.git.joabreu@synopsys.com>
In-Reply-To: <cover.1463996627.git.joabreu@synopsys.com>
When using platform data the devm_clk_get() function is
called causing a probe failure if the clock is not
declared. As we can pass the clock handler by platform
data call only devm_clk_get() when platform data is not
used.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Carlos Palminha <palminha@synopsys.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: linux-snps-arc@lists.infradead.org
Cc: alsa-devel@alsa-project.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
This patch was only introduced in v7.
sound/soc/dwc/designware_i2s.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 4c4f0dc..a97be8e 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -690,15 +690,16 @@ static int dw_i2s_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "no clock configure method\n");
return -ENODEV;
}
- }
- dev->clk = devm_clk_get(&pdev->dev, clk_id);
+ } else {
+ dev->clk = devm_clk_get(&pdev->dev, clk_id);
- if (IS_ERR(dev->clk))
- return PTR_ERR(dev->clk);
+ if (IS_ERR(dev->clk))
+ return PTR_ERR(dev->clk);
- ret = clk_prepare_enable(dev->clk);
- if (ret < 0)
- return ret;
+ ret = clk_prepare_enable(dev->clk);
+ if (ret < 0)
+ return ret;
+ }
}
dev_set_drvdata(&pdev->dev, dev);
--
1.9.1
next prev parent reply other threads:[~2016-05-23 10:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 10:02 [PATCH 0/4 v7] Add I2S audio support for ARC AXS10x boards Jose Abreu
2016-05-23 10:02 ` [PATCH 1/4 v7] ASoC: dwc: Add helper functions to disable/enable irqs Jose Abreu
2016-05-23 17:50 ` Applied "ASoC: dwc: Add helper functions to disable/enable irqs" to the asoc tree Mark Brown
2016-05-23 10:02 ` Jose Abreu [this message]
2016-05-23 16:57 ` [PATCH 2/4 v7] ASoC: dwc: Do not use devm_clk_get() if using platform data Mark Brown
2016-05-23 10:02 ` [PATCH 3/4 v7] ASoC: dwc: Add PIO PCM extension Jose Abreu
2016-05-24 16:41 ` Mark Brown
2016-05-24 17:07 ` Jose Abreu
2016-05-24 17:51 ` Mark Brown
[not found] ` <20160524175144.GO8206-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-05-25 10:11 ` Jose Abreu
2016-05-25 10:18 ` Mark Brown
2016-05-25 10:49 ` Jose Abreu
[not found] ` <57458328.8080900-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
2016-05-25 13:41 ` Mark Brown
2016-05-23 10:02 ` [PATCH 4/4 v7] ASoC: dwc: Add irq parameter to DOCUMENTATION Jose Abreu
2016-05-23 21:31 ` Rob Herring
2016-06-13 16:54 ` Applied "ASoC: dwc: Add irq parameter to DOCUMENTATION" to the asoc tree Mark Brown
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=d288d87fc0f1c07f4d301dc08d32b1bf9915446c.1463996627.git.joabreu@synopsys.com \
--to=jose.abreu@synopsys.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=CARLOS.PALMINHA@synopsys.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--cc=tiwai@suse.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).