summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl_audmix.c
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2020-12-03 02:34:39 +0100
committerMark Brown <broonie@kernel.org>2020-12-03 14:13:23 +0100
commit5057d108d69a55f97f3e436aefbabb9c4064d9d6 (patch)
tree3da08bcffba7375b2e19a243ce480725fc4b9a2d /sound/soc/fsl/fsl_audmix.c
parentMerge series "ASoC: mediatek: mt8192: support new machine rt1015p_rt5682" fro... (diff)
downloadlinux-5057d108d69a55f97f3e436aefbabb9c4064d9d6.tar.xz
linux-5057d108d69a55f97f3e436aefbabb9c4064d9d6.zip
ASoC: fsl_audmix: Remove unneeded data field
The .data field is only used to pass the string name to platform_device_register_data(). Pass the string name directly to make the code simpler. Signed-off-by: Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/r/20201203013439.10617-1-festevam@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl/fsl_audmix.c')
-rw-r--r--sound/soc/fsl/fsl_audmix.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c
index 7ad5925772e8..8dc44dec7956 100644
--- a/sound/soc/fsl/fsl_audmix.c
+++ b/sound/soc/fsl/fsl_audmix.c
@@ -455,7 +455,6 @@ static const struct regmap_config fsl_audmix_regmap_config = {
static const struct of_device_id fsl_audmix_ids[] = {
{
.compatible = "fsl,imx8qm-audmix",
- .data = "imx-audmix",
},
{ /* sentinel */ }
};
@@ -465,17 +464,9 @@ static int fsl_audmix_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct fsl_audmix *priv;
- const char *mdrv;
- const struct of_device_id *of_id;
void __iomem *regs;
int ret;
- of_id = of_match_device(fsl_audmix_ids, dev);
- if (!of_id || !of_id->data)
- return -EINVAL;
-
- mdrv = of_id->data;
-
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -510,10 +501,10 @@ static int fsl_audmix_probe(struct platform_device *pdev)
goto err_disable_pm;
}
- priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0);
+ priv->pdev = platform_device_register_data(dev, "imx-audmix", 0, NULL, 0);
if (IS_ERR(priv->pdev)) {
ret = PTR_ERR(priv->pdev);
- dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret);
+ dev_err(dev, "failed to register platform: %d\n", ret);
goto err_disable_pm;
}