| Message ID | 1404838043-5095-1-git-send-email-badarkhe.manish@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/08/2014 07:47 PM, Manish Badarkhe wrote: > Replaced snd_soc_register_component with its devres equivalent, > devm_snd_soc_register_component. > > Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> Jut to make things easier I think we should not have this patch applied since Jyri's OMAP4+ HDMI audio rework series is going to delete this file. > --- > Changes since V1: > Aligned function parameter properly. > > :100644 100644 eb9c392... 8dcd7f7... M sound/soc/omap/omap-hdmi.c > sound/soc/omap/omap-hdmi.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c > index eb9c392..8dcd7f7 100644 > --- a/sound/soc/omap/omap-hdmi.c > +++ b/sound/soc/omap/omap-hdmi.c > @@ -322,8 +322,9 @@ static int omap_hdmi_probe(struct platform_device *pdev) > } > > dev_set_drvdata(&pdev->dev, hdmi_data); > - ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, > - &omap_hdmi_dai, 1); > + ret = devm_snd_soc_register_component(&pdev->dev, > + &omap_hdmi_component, > + &omap_hdmi_dai, 1); > > if (ret) > return ret; > @@ -335,8 +336,6 @@ static int omap_hdmi_remove(struct platform_device *pdev) > { > struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); > > - snd_soc_unregister_component(&pdev->dev); > - > if (hdmi_data == NULL) { > dev_err(&pdev->dev, "cannot obtain HDMi data\n"); > return -ENODEV; >
Hi Peter, On Wed, Jul 9, 2014 at 11:18 AM, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote: > On 07/08/2014 07:47 PM, Manish Badarkhe wrote: >> Replaced snd_soc_register_component with its devres equivalent, >> devm_snd_soc_register_component. >> >> Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> > > Jut to make things easier I think we should not have this patch applied since > Jyri's OMAP4+ HDMI audio rework series is going to delete this file. Ok fine. Thanks Manish Badarkhe
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index eb9c392..8dcd7f7 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -322,8 +322,9 @@ static int omap_hdmi_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, - &omap_hdmi_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, + &omap_hdmi_component, + &omap_hdmi_dai, 1); if (ret) return ret; @@ -335,8 +336,6 @@ static int omap_hdmi_remove(struct platform_device *pdev) { struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - if (hdmi_data == NULL) { dev_err(&pdev->dev, "cannot obtain HDMi data\n"); return -ENODEV;
Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> --- Changes since V1: Aligned function parameter properly. :100644 100644 eb9c392... 8dcd7f7... M sound/soc/omap/omap-hdmi.c sound/soc/omap/omap-hdmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)