V4L/DVB: V4L2: avoid name conflicts in macros

"sd" and "err" are too common names to be used in macros for local variables.
Prefix them with an underscore to avoid name clashing.

[mchehab@redhat.com: whitespace cleanups]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 9bc51a99376b..77be58c1096b 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -674,18 +674,25 @@ static inline int cx18_raw_vbi(const struct cx18 *cx)
 
 /* Call the specified callback for all subdevs with a grp_id bit matching the
  * mask in hw (if 0, then match them all). Ignore any errors. */
-#define cx18_call_hw(cx, hw, o, f, args...) \
-        __v4l2_device_call_subdevs(&(cx)->v4l2_dev, \
-                                   !(hw) || (sd->grp_id & (hw)), o, f , ##args)
+#define cx18_call_hw(cx, hw, o, f, args...)                             \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
+                __v4l2_device_call_subdevs_p(&(cx)->v4l2_dev, __sd,     \
+                        !(hw) || (__sd->grp_id & (hw)), o, f , ##args); \
+        } while (0)
 
 #define cx18_call_all(cx, o, f, args...) cx18_call_hw(cx, 0, o, f , ##args)
 
 /* Call the specified callback for all subdevs with a grp_id bit matching the
  * mask in hw (if 0, then match them all). If the callback returns an error
  * other than 0 or -ENOIOCTLCMD, then return with that error code. */
-#define cx18_call_hw_err(cx, hw, o, f, args...) \
-        __v4l2_device_call_subdevs_until_err( \
-                   &(cx)->v4l2_dev, !(hw) || (sd->grp_id & (hw)), o, f , ##args)
+#define cx18_call_hw_err(cx, hw, o, f, args...)                         \
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(&(cx)->v4l2_dev,         \
+                        __sd, !(hw) || (__sd->grp_id & (hw)), o, f,     \
+                        ##args);                                        \
+})
 
 #define cx18_call_all_err(cx, o, f, args...) \
         cx18_call_hw_err(cx, 0, o, f , ##args)