Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / atmel / mchp-spdiftx.c

diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c
index d24380046435296cd83a78e54fb0d055ef5d01ab..4850a177803dbee786c34a5aa93793cbc917d167 100644 (file)
--- a/sound/soc/atmel/mchp-spdiftx.c
+++ b/sound/soc/atmel/mchp-spdiftx.c
@@ -196,7 +196,6 @@ struct mchp_spdiftx_dev {
        struct clk                              *pclk;
        struct clk                              *gclk;
        unsigned int                            fmt;
-       const struct mchp_i2s_caps              *caps;
        int                                     gclk_enabled:1;
 };
 
@@ -341,12 +340,10 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd,
 
        ret = regmap_write(dev->regmap, SPDIFTX_MR, mr);
        spin_unlock(&ctrl->lock);
-       if (ret) {
+       if (ret)
                dev_err(dev->dev, "unable to disable TX: %d\n", ret);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
@@ -753,7 +750,8 @@ static struct snd_soc_dai_driver mchp_spdiftx_dai = {
 };
 
 static const struct snd_soc_component_driver mchp_spdiftx_component = {
-       .name           = "mchp-spdiftx",
+       .name                   = "mchp-spdiftx",
+       .legacy_dai_naming      = 1,
 };
 
 static const struct of_device_id mchp_spdiftx_dt_ids[] = {
@@ -762,12 +760,10 @@ static const struct of_device_id mchp_spdiftx_dt_ids[] = {
        },
        { /* sentinel */ }
 };
-
 MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids);
+
 static int mchp_spdiftx_probe(struct platform_device *pdev)
 {
-       struct device_node *np = pdev->dev.of_node;
-       const struct of_device_id *match;
        struct mchp_spdiftx_dev *dev;
        struct resource *mem;
        struct regmap *regmap;
@@ -781,11 +777,6 @@ static int mchp_spdiftx_probe(struct platform_device *pdev)
        if (!dev)
                return -ENOMEM;
 
-       /* Get hardware capabilities. */
-       match = of_match_node(mchp_spdiftx_dt_ids, np);
-       if (match)
-               dev->caps = match->data;
-
        /* Map I/O registers. */
        base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
        if (IS_ERR(base))
@@ -847,12 +838,10 @@ static int mchp_spdiftx_probe(struct platform_device *pdev)
        err = devm_snd_soc_register_component(&pdev->dev,
                                              &mchp_spdiftx_component,
                                              &mchp_spdiftx_dai, 1);
-       if (err) {
+       if (err)
                dev_err(&pdev->dev, "failed to register component: %d\n", err);
-               return err;
-       }
 
-       return 0;
+       return err;
 }
 
 static struct platform_driver mchp_spdiftx_driver = {