Re: [PATCH v2 02/16] ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup

2015-01-14 Thread Sylwester Nawrocki 
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.

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 02/16] ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup

2015-01-06 Thread Mark Brown 
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?


signature.asc
Description: Digital signature

[PATCH v2 02/16] ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup

2014-12-19 Thread Sylwester Nawrocki 
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.nawro...@samsung.com
---
 sound/soc/samsung/i2s.c |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

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
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html