Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf24747 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup 



Tidy up the samsung_i2s_get_driver_data() function by using
IS_ENABLE() instead of #ifdef and add missing braces for
the 'else' part. Also ensure we are not dereferencing NULL
'match' pointer.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fce091ee

sound/soc/samsung/i2s.c

+4 −5
Original line number Diff line number Diff line
@@ -1123,16 +1123,15 @@ static const struct of_device_id exynos_i2s_match[]; 
static inline const struct samsung_i2s_dai_data *samsung_i2s_get_driver_data(

						struct platform_device *pdev)

{

#ifdef CONFIG_OF

	if (pdev->dev.of_node) {

	if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {

		const struct of_device_id *match;

		match = of_match_node(exynos_i2s_match, pdev->dev.of_node);

		return match->data;

	} else

#endif

		return match ? match->data : NULL;

	} else {

		return (struct samsung_i2s_dai_data *)

				platform_get_device_id(pdev)->driver_data;

	}

}



#ifdef CONFIG_PM

static int i2s_runtime_suspend(struct device *dev)