ASoC: fsl_audmix: Remove unneeded data field
Subsystems (3)
Fabio Estevam
reviewerPATCH 1/1 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.
--- sound/soc/fsl/fsl_audmix.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
sound/soc/fsl/fsl_audmix.c +2 -11
@@ -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; }
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 4 lines · Fabio Estevam
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.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: fsl_audmix: Remove unneeded data field
commit: 5057d108d69a55f97f3e436aefbabb9c4064d9d6
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark