From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756346AbaD1OON (ORCPT ); Mon, 28 Apr 2014 10:14:13 -0400 Received: from ring0.de ([5.45.105.125]:51838 "EHLO ring0.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756094AbaD1OHp (ORCPT ); Mon, 28 Apr 2014 10:07:45 -0400 X-Spam-Report: * -0.0 NO_RELAYS Informational: message was not relayed via SMTP * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 NO_RECEIVED Informational: message has no Received headers From: Sebastian Reichel To: Sebastian Reichel , Mark Brown , Peter Ujfalusi Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Tony Lindgren , Liam Girdwood , Jarkko Nikula , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, alsa-devel@alsa-project.org, Sebastian Reichel , =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCHv2 3/9] ASoC: omap: rx51: Use devm_snd_soc_register_card Date: Mon, 28 Apr 2014 16:07:21 +0200 Message-Id: <1398694047-28596-4-git-send-email-sre@kernel.org> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398694047-28596-1-git-send-email-sre@kernel.org> References: <1398694047-28596-1-git-send-email-sre@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch converts the rx51 ASoC module to use devm_snd_soc_register_card. Signed-off-by: Pali Rohár Signed-off-by: Sebastian Reichel --- sound/soc/omap/rx51.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 55713d0..bbe3a66 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -363,10 +363,9 @@ static struct snd_soc_card rx51_sound_card = { .num_dapm_routes = ARRAY_SIZE(audio_map), }; -static struct platform_device *rx51_snd_device; - -static int __init rx51_soc_init(void) +static int rx51_soc_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &rx51_sound_card; int err; if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900")) @@ -381,22 +380,16 @@ static int __init rx51_soc_init(void) if (err) goto err_gpio_eci_sw; - rx51_snd_device = platform_device_alloc("soc-audio", -1); - if (!rx51_snd_device) { - err = -ENOMEM; - goto err1; - } - - platform_set_drvdata(rx51_snd_device, &rx51_sound_card); + card->dev = &pdev->dev; - err = platform_device_add(rx51_snd_device); - if (err) - goto err2; + err = devm_snd_soc_register_card(card->dev, card); + if (err) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", err); + goto err_snd; + } return 0; -err2: - platform_device_put(rx51_snd_device); -err1: +err_snd: gpio_free(RX51_ECI_SW_GPIO); err_gpio_eci_sw: gpio_free(RX51_TVOUT_SEL_GPIO); @@ -405,18 +398,27 @@ err_gpio_tvout_sel: return err; } -static void __exit rx51_soc_exit(void) +static int rx51_soc_remove(struct platform_device *pdev) { snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios), rx51_av_jack_gpios); - platform_device_unregister(rx51_snd_device); gpio_free(RX51_ECI_SW_GPIO); gpio_free(RX51_TVOUT_SEL_GPIO); + + return 0; } -module_init(rx51_soc_init); -module_exit(rx51_soc_exit); +static struct platform_driver rx51_soc_driver = { + .driver = { + .name = "rx51-audio", + .owner = THIS_MODULE, + }, + .probe = rx51_soc_probe, + .remove = rx51_soc_remove, +}; + +module_platform_driver(rx51_soc_driver); MODULE_AUTHOR("Nokia Corporation"); MODULE_DESCRIPTION("ALSA SoC Nokia RX-51"); -- 1.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Reichel Subject: [PATCHv2 3/9] ASoC: omap: rx51: Use devm_snd_soc_register_card Date: Mon, 28 Apr 2014 16:07:21 +0200 Message-ID: <1398694047-28596-4-git-send-email-sre@kernel.org> References: <1398694047-28596-1-git-send-email-sre@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1398694047-28596-1-git-send-email-sre@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Sebastian Reichel , Mark Brown , Peter Ujfalusi Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Pawel Moll , Ian Campbell , Tony Lindgren , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Liam Girdwood , Rob Herring , linux-kernel@vger.kernel.org, Sebastian Reichel , Kumar Gala , linux-omap@vger.kernel.org, Jarkko Nikula List-Id: devicetree@vger.kernel.org VGhpcyBwYXRjaCBjb252ZXJ0cyB0aGUgcng1MSBBU29DIG1vZHVsZSB0byB1c2UKZGV2bV9zbmRf c29jX3JlZ2lzdGVyX2NhcmQuCgpTaWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8cGFsaS5yb2hh ckBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IFNlYmFzdGlhbiBSZWljaGVsIDxzcmVAa2VybmVs Lm9yZz4KLS0tCiBzb3VuZC9zb2Mvb21hcC9yeDUxLmMgfCA0MiArKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp LCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zb3VuZC9zb2Mvb21hcC9yeDUxLmMgYi9z b3VuZC9zb2Mvb21hcC9yeDUxLmMKaW5kZXggNTU3MTNkMC4uYmJlM2E2NiAxMDA2NDQKLS0tIGEv c291bmQvc29jL29tYXAvcng1MS5jCisrKyBiL3NvdW5kL3NvYy9vbWFwL3J4NTEuYwpAQCAtMzYz LDEwICszNjMsOSBAQCBzdGF0aWMgc3RydWN0IHNuZF9zb2NfY2FyZCByeDUxX3NvdW5kX2NhcmQg PSB7CiAJLm51bV9kYXBtX3JvdXRlcyA9IEFSUkFZX1NJWkUoYXVkaW9fbWFwKSwKIH07CiAKLXN0 YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpyeDUxX3NuZF9kZXZpY2U7Ci0KLXN0YXRpYyBp bnQgX19pbml0IHJ4NTFfc29jX2luaXQodm9pZCkKK3N0YXRpYyBpbnQgcng1MV9zb2NfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsKKwlzdHJ1Y3Qgc25kX3NvY19jYXJkICpj YXJkID0gJnJ4NTFfc291bmRfY2FyZDsKIAlpbnQgZXJyOwogCiAJaWYgKCFtYWNoaW5lX2lzX25v a2lhX3J4NTEoKSAmJiAhb2ZfbWFjaGluZV9pc19jb21wYXRpYmxlKCJub2tpYSxvbWFwMy1uOTAw IikpCkBAIC0zODEsMjIgKzM4MCwxNiBAQCBzdGF0aWMgaW50IF9faW5pdCByeDUxX3NvY19pbml0 KHZvaWQpCiAJaWYgKGVycikKIAkJZ290byBlcnJfZ3Bpb19lY2lfc3c7CiAKLQlyeDUxX3NuZF9k ZXZpY2UgPSBwbGF0Zm9ybV9kZXZpY2VfYWxsb2MoInNvYy1hdWRpbyIsIC0xKTsKLQlpZiAoIXJ4 NTFfc25kX2RldmljZSkgewotCQllcnIgPSAtRU5PTUVNOwotCQlnb3RvIGVycjE7Ci0JfQotCi0J cGxhdGZvcm1fc2V0X2RydmRhdGEocng1MV9zbmRfZGV2aWNlLCAmcng1MV9zb3VuZF9jYXJkKTsK KwljYXJkLT5kZXYgPSAmcGRldi0+ZGV2OwogCi0JZXJyID0gcGxhdGZvcm1fZGV2aWNlX2FkZChy eDUxX3NuZF9kZXZpY2UpOwotCWlmIChlcnIpCi0JCWdvdG8gZXJyMjsKKwllcnIgPSBkZXZtX3Nu ZF9zb2NfcmVnaXN0ZXJfY2FyZChjYXJkLT5kZXYsIGNhcmQpOworCWlmIChlcnIpIHsKKwkJZGV2 X2VycigmcGRldi0+ZGV2LCAic25kX3NvY19yZWdpc3Rlcl9jYXJkIGZhaWxlZCAoJWQpXG4iLCBl cnIpOworCQlnb3RvIGVycl9zbmQ7CisJfQogCiAJcmV0dXJuIDA7Ci1lcnIyOgotCXBsYXRmb3Jt X2RldmljZV9wdXQocng1MV9zbmRfZGV2aWNlKTsKLWVycjE6CitlcnJfc25kOgogCWdwaW9fZnJl ZShSWDUxX0VDSV9TV19HUElPKTsKIGVycl9ncGlvX2VjaV9zdzoKIAlncGlvX2ZyZWUoUlg1MV9U Vk9VVF9TRUxfR1BJTyk7CkBAIC00MDUsMTggKzM5OCwyNyBAQCBlcnJfZ3Bpb190dm91dF9zZWw6 CiAJcmV0dXJuIGVycjsKIH0KIAotc3RhdGljIHZvaWQgX19leGl0IHJ4NTFfc29jX2V4aXQodm9p ZCkKK3N0YXRpYyBpbnQgcng1MV9zb2NfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYpCiB7CiAJc25kX3NvY19qYWNrX2ZyZWVfZ3Bpb3MoJnJ4NTFfYXZfamFjaywgQVJSQVlfU0la RShyeDUxX2F2X2phY2tfZ3Bpb3MpLAogCQkJCXJ4NTFfYXZfamFja19ncGlvcyk7CiAKLQlwbGF0 Zm9ybV9kZXZpY2VfdW5yZWdpc3RlcihyeDUxX3NuZF9kZXZpY2UpOwogCWdwaW9fZnJlZShSWDUx X0VDSV9TV19HUElPKTsKIAlncGlvX2ZyZWUoUlg1MV9UVk9VVF9TRUxfR1BJTyk7CisKKwlyZXR1 cm4gMDsKIH0KIAotbW9kdWxlX2luaXQocng1MV9zb2NfaW5pdCk7Ci1tb2R1bGVfZXhpdChyeDUx X3NvY19leGl0KTsKK3N0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIHJ4NTFfc29jX2RyaXZl ciA9IHsKKwkuZHJpdmVyID0geworCQkubmFtZSA9ICJyeDUxLWF1ZGlvIiwKKwkJLm93bmVyID0g VEhJU19NT0RVTEUsCisJfSwKKwkucHJvYmUgPSByeDUxX3NvY19wcm9iZSwKKwkucmVtb3ZlID0g cng1MV9zb2NfcmVtb3ZlLAorfTsKKworbW9kdWxlX3BsYXRmb3JtX2RyaXZlcihyeDUxX3NvY19k cml2ZXIpOwogCiBNT0RVTEVfQVVUSE9SKCJOb2tpYSBDb3Jwb3JhdGlvbiIpOwogTU9EVUxFX0RF U0NSSVBUSU9OKCJBTFNBIFNvQyBOb2tpYSBSWC01MSIpOwotLSAKMS45LjIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFsc2EtZGV2ZWwgbWFpbGluZyBs aXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0Lm9yZwpodHRwOi8vbWFpbG1hbi5hbHNhLXByb2pl Y3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZlbAo=