iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup

Browse Source 
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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2015-01-14 19:42:28 +01:00 committed by Mark Brown
parent fce091ee0a
commit 9cf2474731
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/samsung/i2s.c
View File

@ -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( static inline const struct samsung_i2s_dai_data *samsung_i2s_get_driver_data(
struct platform_device *pdev) struct platform_device *pdev)
{ {
#ifdef CONFIG_OF if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
if (pdev->dev.of_node) {
const struct of_device_id *match; const struct of_device_id *match;
match = of_match_node(exynos_i2s_match, pdev->dev.of_node); match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
return match->data; return match ? match->data : NULL;
} else } else {
#endif
return (struct samsung_i2s_dai_data *) return (struct samsung_i2s_dai_data *)
platform_get_device_id(pdev)->driver_data; platform_get_device_id(pdev)->driver_data;
} }
}
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int i2s_runtime_suspend(struct device *dev) static int i2s_runtime_suspend(struct device *dev)