Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754975Ab3JMQSs (ORCPT ); Sun, 13 Oct 2013 12:18:48 -0400 Received: from sauhun.de ([89.238.76.85]:56498 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754811Ab3JMQS3 (ORCPT ); Sun, 13 Oct 2013 12:18:29 -0400 From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Cc: Wolfram Sang , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.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 Message-Id: <1381681071-6021-5-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1381681071-6021-1-git-send-email-wsa@the-dreams.de> References: <1381681071-6021-1-git-send-email-wsa@the-dreams.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1468 Lines: 45 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 (personally at LCE13) Signed-off-by: Wolfram Sang --- 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 #include #include -#include #include @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/