[PATCH] ASoC: ti: delete some dead code in omap_abe_probe()
This code checks "priv->mclk_freq" twice and the second check is not required. The code is left over from when removed support for legacy boot.
Fixes: 8fe120b5a665 ("ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot)") Signed-off-by: Dan Carpenter dan.carpenter@oracle.com --- sound/soc/ti/omap-abe-twl6040.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/sound/soc/ti/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c index 91cc9a4f44d7..2e3d1eea77c1 100644 --- a/sound/soc/ti/omap-abe-twl6040.c +++ b/sound/soc/ti/omap-abe-twl6040.c @@ -292,11 +292,6 @@ static int omap_abe_probe(struct platform_device *pdev)
card->fully_routed = 1;
- if (!priv->mclk_freq) { - dev_err(&pdev->dev, "MCLK frequency missing\n"); - return -ENODEV; - } - card->dai_link = priv->dai_links; card->num_links = num_links;
On 30/06/2021 14:18, Dan Carpenter wrote:
This code checks "priv->mclk_freq" twice and the second check is not required. The code is left over from when removed support for legacy boot.
Good find, thank you!
Acked-by: Peter Ujfalusi peter.ujfalusi@gmail.com
Fixes: 8fe120b5a665 ("ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot)") Signed-off-by: Dan Carpenter dan.carpenter@oracle.com
sound/soc/ti/omap-abe-twl6040.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/sound/soc/ti/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c index 91cc9a4f44d7..2e3d1eea77c1 100644 --- a/sound/soc/ti/omap-abe-twl6040.c +++ b/sound/soc/ti/omap-abe-twl6040.c @@ -292,11 +292,6 @@ static int omap_abe_probe(struct platform_device *pdev)
card->fully_routed = 1;
- if (!priv->mclk_freq) {
dev_err(&pdev->dev, "MCLK frequency missing\n");return -ENODEV;- }
- card->dai_link = priv->dai_links; card->num_links = num_links;
On Wed, 30 Jun 2021 14:18:53 +0300, Dan Carpenter wrote:
This code checks "priv->mclk_freq" twice and the second check is not required. The code is left over from when removed support for legacy boot.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: ti: delete some dead code in omap_abe_probe() commit: 3666a8f820075e99539ab50687e80fadf997822f
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
participants (3)
-
Dan Carpenter -
Mark Brown -
Péter Ujfalusi