Message ID | 1404536979-5318-1-git-send-email-badarkhe.manish@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 07/05/2014 08:09 AM, 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> > --- > :100644 100644 efe2cd6... bfc8f8e... M sound/soc/omap/omap-mcbsp.c > sound/soc/omap/omap-mcbsp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c > index efe2cd6..bfc8f8e 100644 > --- a/sound/soc/omap/omap-mcbsp.c > +++ b/sound/soc/omap/omap-mcbsp.c > @@ -805,7 +805,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) > if (ret) > return ret; > > - ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, > + ret = devm_snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, > &omap_mcbsp_dai, 1); Can you align the parameters as well? > if (ret) > return ret; > @@ -817,8 +817,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) > { > struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > > - snd_soc_unregister_component(&pdev->dev); > - > if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) > mcbsp->pdata->ops->free(mcbsp->id); > >
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index efe2cd6..bfc8f8e 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -805,7 +805,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) if (ret) return ret; - ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, + ret = devm_snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, &omap_mcbsp_dai, 1); if (ret) return ret; @@ -817,8 +817,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) { struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - snd_soc_unregister_component(&pdev->dev); - if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id);
Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> --- :100644 100644 efe2cd6... bfc8f8e... M sound/soc/omap/omap-mcbsp.c sound/soc/omap/omap-mcbsp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)