| Message ID | 1418997336-17777-3-git-send-email-s.nawrocki@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 19, 2014 at 02:55:22PM +0100, Sylwester Nawrocki wrote: > 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. This doesn't apply against current code, can you please check and resend?
On 06/01/15 19:14, Mark Brown wrote: > On Fri, Dec 19, 2014 at 02:55:22PM +0100, Sylwester Nawrocki wrote: >> > 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. > > This doesn't apply against current code, can you please check and > resend? OK, I will resend it rebased onto your 3.19-rc1 topic/samsung branch.
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 827e4b4..430298c 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1123,15 +1123,14 @@ 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_RUNTIME
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> --- sound/soc/samsung/i2s.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)