lkml.org 
[lkml]   [2021]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/20] ASoC: tegra20: spdif: Use more resource-managed helpers
    Date
    Use resource-managed helpers to make code cleaner. Driver's remove callback
    isn't needed anymore since driver is completely resource-managed now.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    ---
    sound/soc/tegra/tegra20_spdif.c | 33 +++++++++------------------------
    sound/soc/tegra/tegra_pcm.c | 6 ++++++
    sound/soc/tegra/tegra_pcm.h | 1 +
    3 files changed, 16 insertions(+), 24 deletions(-)

    diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
    index 9383683aa4e9..6ca48bc322ae 100644
    --- a/sound/soc/tegra/tegra20_spdif.c
    +++ b/sound/soc/tegra/tegra20_spdif.c
    @@ -289,38 +289,24 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
    spdif->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
    spdif->playback_dma_data.maxburst = 4;

    - pm_runtime_enable(&pdev->dev);
    + ret = devm_pm_runtime_enable(&pdev->dev);
    + if (ret)
    + return ret;

    - ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
    - &tegra20_spdif_dai, 1);
    + ret = devm_snd_soc_register_component(&pdev->dev,
    + &tegra20_spdif_component,
    + &tegra20_spdif_dai, 1);
    if (ret) {
    dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
    - goto err_pm_disable;
    + return ret;
    }

    - ret = tegra_pcm_platform_register(&pdev->dev);
    + ret = devm_tegra_pcm_platform_register(&pdev->dev);
    if (ret) {
    dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
    - goto err_unregister_component;
    + return ret;
    }

    - return 0;
    -
    -err_unregister_component:
    - snd_soc_unregister_component(&pdev->dev);
    -err_pm_disable:
    - pm_runtime_disable(&pdev->dev);
    -
    - return ret;
    -}
    -
    -static int tegra20_spdif_platform_remove(struct platform_device *pdev)
    -{
    - tegra_pcm_platform_unregister(&pdev->dev);
    - snd_soc_unregister_component(&pdev->dev);
    -
    - pm_runtime_disable(&pdev->dev);
    -
    return 0;
    }

    @@ -342,7 +328,6 @@ static struct platform_driver tegra20_spdif_driver = {
    .of_match_table = tegra20_spdif_of_match,
    },
    .probe = tegra20_spdif_platform_probe,
    - .remove = tegra20_spdif_platform_remove,
    };
    module_platform_driver(tegra20_spdif_driver);

    diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
    index ef1e74d95236..468c8e77de21 100644
    --- a/sound/soc/tegra/tegra_pcm.c
    +++ b/sound/soc/tegra/tegra_pcm.c
    @@ -48,6 +48,12 @@ int tegra_pcm_platform_register(struct device *dev)
    }
    EXPORT_SYMBOL_GPL(tegra_pcm_platform_register);

    +int devm_tegra_pcm_platform_register(struct device *dev)
    +{
    + return devm_snd_dmaengine_pcm_register(dev, &tegra_dmaengine_pcm_config, 0);
    +}
    +EXPORT_SYMBOL_GPL(devm_tegra_pcm_platform_register);
    +
    int tegra_pcm_platform_register_with_chan_names(struct device *dev,
    struct snd_dmaengine_pcm_config *config,
    char *txdmachan, char *rxdmachan)
    diff --git a/sound/soc/tegra/tegra_pcm.h b/sound/soc/tegra/tegra_pcm.h
    index d602126c65b7..2a36eea1740d 100644
    --- a/sound/soc/tegra/tegra_pcm.h
    +++ b/sound/soc/tegra/tegra_pcm.h
    @@ -32,6 +32,7 @@ int tegra_pcm_hw_params(struct snd_soc_component *component,
    snd_pcm_uframes_t tegra_pcm_pointer(struct snd_soc_component *component,
    struct snd_pcm_substream *substream);
    int tegra_pcm_platform_register(struct device *dev);
    +int devm_tegra_pcm_platform_register(struct device *dev);
    int tegra_pcm_platform_register_with_chan_names(struct device *dev,
    struct snd_dmaengine_pcm_config *config,
    char *txdmachan, char *rxdmachan);
    --
    2.33.1
    \
     
     \ /
      Last update: 2021-11-26 17:38    [W:4.035 / U:0.784 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site