From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbaDONjw (ORCPT ); Tue, 15 Apr 2014 09:39:52 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:44228 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbaDONjt (ORCPT ); Tue, 15 Apr 2014 09:39:49 -0400 Message-ID: <534D3681.3010200@st.com> Date: Tue, 15 Apr 2014 19:09:13 +0530 From: Rajeev kumar User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Sebastian Reichel , Peter Ujfalusi Cc: Sebastian Reichel , Mark Brown , Mark Rutland , "devicetree@vger.kernel.org" , "alsa-devel@alsa-project.org" , Pawel Moll , Ian Campbell , Tony Lindgren , =?UTF-8?B?UGFsaSBSb2jDoXI=?= , Liam Girdwood , Rob Herring , "linux-kernel@vger.kernel.org" , Kumar Gala , "linux-omap@vger.kernel.org" , Jarkko Nikula Subject: Re: [alsa-devel] [PATCH 1/5] ASoC: omap: rx51: Use devm_snd_soc_register_card References: <1396733753-9820-1-git-send-email-sre@kernel.org> <1396733753-9820-2-git-send-email-sre@kernel.org> In-Reply-To: <1396733753-9820-2-git-send-email-sre@kernel.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.96,1.0.14,0.0.0000 definitions=2014-04-14_01:2014-04-14,2014-04-14,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/6/2014 3:05 AM, Sebastian Reichel wrote: > From: Pali Rohár > > This patch converts the rx51 ASoC module to use > devm_snd_soc_register_card. It also adds module alias > to support driver autoloading. > > Signed-off-by: Pali Rohár > Signed-off-by: Sebastian Reichel > --- > sound/soc/omap/rx51.c | 48 ++++++++++++++++++++++++++++-------------------- > 1 file changed, 28 insertions(+), 20 deletions(-) > > diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c > index 7fb3d4b..58f5e12 100644 > --- a/sound/soc/omap/rx51.c > +++ b/sound/soc/omap/rx51.c > @@ -394,10 +394,9 @@ static struct snd_soc_card rx51_sound_card = { > .num_configs = ARRAY_SIZE(rx51_codec_conf), > }; > > -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")) > @@ -412,22 +411,17 @@ 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: > + card->dev = NULL; Why this is required??? ~Rajeev > gpio_free(RX51_ECI_SW_GPIO); > err_gpio_eci_sw: > gpio_free(RX51_TVOUT_SEL_GPIO); > @@ -436,19 +430,33 @@ err_gpio_tvout_sel: > return err; > } > > -static void __exit rx51_soc_exit(void) > +static int rx51_soc_remove(struct platform_device *pdev) > { > + struct snd_soc_card *card = platform_get_drvdata(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); > + card->dev = NULL; > + > 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"); > MODULE_LICENSE("GPL"); > +MODULE_ALIAS("platform:rx51-audio"); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajeev kumar Subject: Re: [PATCH 1/5] ASoC: omap: rx51: Use devm_snd_soc_register_card Date: Tue, 15 Apr 2014 19:09:13 +0530 Message-ID: <534D3681.3010200@st.com> References: <1396733753-9820-1-git-send-email-sre@kernel.org> <1396733753-9820-2-git-send-email-sre@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1396733753-9820-2-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 , Peter Ujfalusi Cc: Mark Rutland , "devicetree@vger.kernel.org" , "alsa-devel@alsa-project.org" , Pawel Moll , Ian Campbell , Tony Lindgren , Kumar Gala , Liam Girdwood , Rob Herring , "linux-kernel@vger.kernel.org" , Sebastian Reichel , Mark Brown , =?UTF-8?B?UGFsaSBSb2jDoXI=?= , "linux-omap@vger.kernel.org" , Jarkko Nikula List-Id: devicetree@vger.kernel.org T24gNC82LzIwMTQgMzowNSBBTSwgU2ViYXN0aWFuIFJlaWNoZWwgd3JvdGU6Cj4gRnJvbTogUGFs aSBSb2jDoXIgPHBhbGkucm9oYXJAZ21haWwuY29tPgo+Cj4gVGhpcyBwYXRjaCBjb252ZXJ0cyB0 aGUgcng1MSBBU29DIG1vZHVsZSB0byB1c2UKPiBkZXZtX3NuZF9zb2NfcmVnaXN0ZXJfY2FyZC4g SXQgYWxzbyBhZGRzIG1vZHVsZSBhbGlhcwo+IHRvIHN1cHBvcnQgZHJpdmVyIGF1dG9sb2FkaW5n Lgo+Cj4gU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGkucm9oYXJAZ21haWwuY29tPgo+ IFNpZ25lZC1vZmYtYnk6IFNlYmFzdGlhbiBSZWljaGVsIDxzcmVAa2VybmVsLm9yZz4KPiAtLS0K PiAgIHNvdW5kL3NvYy9vbWFwL3J4NTEuYyB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMo KyksIDIwIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy9vbWFwL3J4NTEu YyBiL3NvdW5kL3NvYy9vbWFwL3J4NTEuYwo+IGluZGV4IDdmYjNkNGIuLjU4ZjVlMTIgMTAwNjQ0 Cj4gLS0tIGEvc291bmQvc29jL29tYXAvcng1MS5jCj4gKysrIGIvc291bmQvc29jL29tYXAvcng1 MS5jCj4gQEAgLTM5NCwxMCArMzk0LDkgQEAgc3RhdGljIHN0cnVjdCBzbmRfc29jX2NhcmQgcng1 MV9zb3VuZF9jYXJkID0gewo+ICAgCS5udW1fY29uZmlncyA9IEFSUkFZX1NJWkUocng1MV9jb2Rl Y19jb25mKSwKPiAgIH07Cj4KPiAtc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnJ4NTFf c25kX2RldmljZTsKPiAtCj4gLXN0YXRpYyBpbnQgX19pbml0IHJ4NTFfc29jX2luaXQodm9pZCkK PiArc3RhdGljIGludCByeDUxX3NvY19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 KQo+ICAgewo+ICsJc3RydWN0IHNuZF9zb2NfY2FyZCAqY2FyZCA9ICZyeDUxX3NvdW5kX2NhcmQ7 Cj4gICAJaW50IGVycjsKPgo+ICAgCWlmICghbWFjaGluZV9pc19ub2tpYV9yeDUxKCkgJiYgIW9m X21hY2hpbmVfaXNfY29tcGF0aWJsZSgibm9raWEsb21hcDMtbjkwMCIpKQo+IEBAIC00MTIsMjIg KzQxMSwxNyBAQCBzdGF0aWMgaW50IF9faW5pdCByeDUxX3NvY19pbml0KHZvaWQpCj4gICAJaWYg KGVycikKPiAgIAkJZ290byBlcnJfZ3Bpb19lY2lfc3c7Cj4KPiAtCXJ4NTFfc25kX2RldmljZSA9 IHBsYXRmb3JtX2RldmljZV9hbGxvYygic29jLWF1ZGlvIiwgLTEpOwo+IC0JaWYgKCFyeDUxX3Nu ZF9kZXZpY2UpIHsKPiAtCQllcnIgPSAtRU5PTUVNOwo+IC0JCWdvdG8gZXJyMTsKPiAtCX0KPiAt Cj4gLQlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShyeDUxX3NuZF9kZXZpY2UsICZyeDUxX3NvdW5kX2Nh cmQpOwo+ICsJY2FyZC0+ZGV2ID0gJnBkZXYtPmRldjsKPgo+IC0JZXJyID0gcGxhdGZvcm1fZGV2 aWNlX2FkZChyeDUxX3NuZF9kZXZpY2UpOwo+IC0JaWYgKGVycikKPiAtCQlnb3RvIGVycjI7Cj4g KwllcnIgPSBkZXZtX3NuZF9zb2NfcmVnaXN0ZXJfY2FyZChjYXJkLT5kZXYsIGNhcmQpOwo+ICsJ aWYgKGVycikgewo+ICsJCWRldl9lcnIoJnBkZXYtPmRldiwgInNuZF9zb2NfcmVnaXN0ZXJfY2Fy ZCBmYWlsZWQgKCVkKVxuIiwgZXJyKTsKPiArCQlnb3RvIGVycl9zbmQ7Cj4gKwl9Cj4KPiAgIAly ZXR1cm4gMDsKPiAtZXJyMjoKPiAtCXBsYXRmb3JtX2RldmljZV9wdXQocng1MV9zbmRfZGV2aWNl KTsKPiAtZXJyMToKPiArZXJyX3NuZDoKPiArCWNhcmQtPmRldiA9IE5VTEw7CgpXaHkgdGhpcyBp cyByZXF1aXJlZD8/PwoKflJhamVldgoKPiAgIAlncGlvX2ZyZWUoUlg1MV9FQ0lfU1dfR1BJTyk7 Cj4gICBlcnJfZ3Bpb19lY2lfc3c6Cj4gICAJZ3Bpb19mcmVlKFJYNTFfVFZPVVRfU0VMX0dQSU8p Owo+IEBAIC00MzYsMTkgKzQzMCwzMyBAQCBlcnJfZ3Bpb190dm91dF9zZWw6Cj4gICAJcmV0dXJu IGVycjsKPiAgIH0KPgo+IC1zdGF0aWMgdm9pZCBfX2V4aXQgcng1MV9zb2NfZXhpdCh2b2lkKQo+ ICtzdGF0aWMgaW50IHJ4NTFfc29jX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 KQo+ICAgewo+ICsJc3RydWN0IHNuZF9zb2NfY2FyZCAqY2FyZCA9IHBsYXRmb3JtX2dldF9kcnZk YXRhKHBkZXYpOwo+ICsKPiAgIAlzbmRfc29jX2phY2tfZnJlZV9ncGlvcygmcng1MV9hdl9qYWNr LCBBUlJBWV9TSVpFKHJ4NTFfYXZfamFja19ncGlvcyksCj4gICAJCQkJcng1MV9hdl9qYWNrX2dw aW9zKTsKPgo+IC0JcGxhdGZvcm1fZGV2aWNlX3VucmVnaXN0ZXIocng1MV9zbmRfZGV2aWNlKTsK PiArCWNhcmQtPmRldiA9IE5VTEw7Cj4gKwo+ICAgCWdwaW9fZnJlZShSWDUxX0VDSV9TV19HUElP KTsKPiAgIAlncGlvX2ZyZWUoUlg1MV9UVk9VVF9TRUxfR1BJTyk7Cj4gKwo+ICsJcmV0dXJuIDA7 Cj4gICB9Cj4KPiAtbW9kdWxlX2luaXQocng1MV9zb2NfaW5pdCk7Cj4gLW1vZHVsZV9leGl0KHJ4 NTFfc29jX2V4aXQpOwo+ICtzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciByeDUxX3NvY19k cml2ZXIgPSB7Cj4gKwkuZHJpdmVyID0gewo+ICsJCS5uYW1lID0gInJ4NTEtYXVkaW8iLAo+ICsJ CS5vd25lciA9IFRISVNfTU9EVUxFLAo+ICsJfSwKPiArCS5wcm9iZSA9IHJ4NTFfc29jX3Byb2Jl LAo+ICsJLnJlbW92ZSA9IHJ4NTFfc29jX3JlbW92ZSwKPiArfTsKPiArCj4gK21vZHVsZV9wbGF0 Zm9ybV9kcml2ZXIocng1MV9zb2NfZHJpdmVyKTsKPgo+ICAgTU9EVUxFX0FVVEhPUigiTm9raWEg Q29ycG9yYXRpb24iKTsKPiAgIE1PRFVMRV9ERVNDUklQVElPTigiQUxTQSBTb0MgTm9raWEgUlgt NTEiKTsKPiAgIE1PRFVMRV9MSUNFTlNFKCJHUEwiKTsKPiArTU9EVUxFX0FMSUFTKCJwbGF0Zm9y bTpyeDUxLWF1ZGlvIik7Cj4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkFsc2EtZGV2ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0 Lm9yZwpodHRwOi8vbWFpbG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxz YS1kZXZlbAo=