ASoC: amd: acp: rembrandt: Drop if blocks with always false condition

rembrandt_audio_remove() is only called after a successful call to
rembrandt_audio_probe(). With the latter it's sure that dev_get_platdata()
returns a non-NULL value and also that ->base is non-NULL. So the
corresponding check can be dropped.

While touching these lines join declaration and assignment into a single
line and make use of dev = &pdev->dev;

This prepares converting platform driver remove callbacks to return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c
index 2b57c0c..15cd3f8 100644 (file)
--- a/sound/soc/amd/acp/acp-rembrandt.c
+++ b/sound/soc/amd/acp/acp-rembrandt.c
@@ -370,13 +370,7 @@ static int rembrandt_audio_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct acp_dev_data *adata = dev_get_drvdata(dev);
-       struct acp_chip_info *chip;
-
-       chip = dev_get_platdata(&pdev->dev);
-       if (!chip || !chip->base) {
-               dev_err(&pdev->dev, "ACP chip data is NULL\n");
-               return -ENODEV;
-       }
+       struct acp_chip_info *chip = dev_get_platdata(dev);
 
        rmb_acp_deinit(chip->base);