From: wsa@the-dreams.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] sound/soc/atmel: don't use devm_pinctrl_get_select_default() in probe
Date: Sun, 13 Oct 2013 18:17:50 +0200 [thread overview]
Message-ID: <1381681071-6021-5-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1381681071-6021-1-git-send-email-wsa@the-dreams.de>
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins.
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
sound/soc/atmel/atmel_wm8904.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index 7222380..b4e3690 100644
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
#include <sound/soc.h>
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev)
struct snd_soc_card *card = &atmel_asoc_wm8904_card;
struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink;
struct clk *clk_src;
- struct pinctrl *pinctrl;
int id, ret;
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- dev_err(&pdev->dev, "failed to request pinctrl\n");
- return PTR_ERR(pinctrl);
- }
-
card->dev = &pdev->dev;
ret = atmel_asoc_wm8904_dt_init(pdev);
if (ret) {
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-13 16:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-13 16:17 [PATCH 0/4] remove devm_pinctrl_get_select_default from drivers Wolfram Sang
2013-10-13 16:17 ` [PATCH 1/4] drivers/gpu/drm/tilcdc: don't use devm_pinctrl_get_select_default() in probe Wolfram Sang
2013-10-13 16:17 ` [PATCH 2/4] drivers/mmc/host: " Wolfram Sang
2013-10-13 16:17 ` [PATCH 3/4] drivers/pwm: " Wolfram Sang
2013-10-15 10:17 ` Thierry Reding
2013-10-22 7:39 ` Thierry Reding
2013-10-13 16:17 ` Wolfram Sang [this message]
2013-10-14 5:28 ` [PATCH 4/4] sound/soc/atmel: " Bo Shen
2013-10-14 13:17 ` Mark Brown
2013-10-14 14:56 ` Wolfram Sang
2013-10-14 16:37 ` Mark Brown
2013-10-17 16:46 ` Wolfram Sang
2013-10-17 17:42 ` 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=1381681071-6021-5-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).