Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

1 files changed, 39 insertions, 18 deletions

diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index 8bcbd7a0271c..6648036b728d 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -101,46 +101,67 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 /* Call the specified callback for all subdevs matching the condition.
    Ignore any errors. Note that you cannot add or delete a subdev
    while walking the subdevs list. */
-#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+#define __v4l2_device_call_subdevs_p(v4l2_dev, sd, cond, o, f, args...) \
         do {                                                            \
-                struct v4l2_subdev *sd;                                 \
+                list_for_each_entry((sd), &(v4l2_dev)->subdevs, list)   \
+                        if ((cond) && (sd)->ops->o && (sd)->ops->o->f)  \
+                                (sd)->ops->o->f((sd) , ##args);         \
+        } while (0)
+
+#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
                                                                         \
-                list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)     \
-                        if ((cond) && sd->ops->o && sd->ops->o->f)      \
-                                sd->ops->o->f(sd , ##args);             \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd, cond, o,   \
+                                                f , ##args);            \
         } while (0)
 
 /* Call the specified callback for all subdevs matching the condition.
    If the callback returns an error other than 0 or -ENOIOCTLCMD, then
    return with that error code. Note that you cannot add or delete a
    subdev while walking the subdevs list. */
-#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+#define __v4l2_device_call_subdevs_until_err_p(v4l2_dev, sd, cond, o, f, args...) \
 ({                                                                      \
-        struct v4l2_subdev *sd;                                         \
-        long err = 0;                                                   \
+        long __err = 0;                                                 \
                                                                         \
-        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) {           \
-                if ((cond) && sd->ops->o && sd->ops->o->f)              \
-                        err = sd->ops->o->f(sd , ##args);               \
-                if (err && err != -ENOIOCTLCMD)                         \
+        list_for_each_entry((sd), &(v4l2_dev)->subdevs, list) {         \
+                if ((cond) && (sd)->ops->o && (sd)->ops->o->f)          \
+                        __err = (sd)->ops->o->f((sd) , ##args);         \
+                if (__err && __err != -ENOIOCTLCMD)                     \
                         break;                                          \
         }                                                               \
-        (err == -ENOIOCTLCMD) ? 0 : err;                                \
+        (__err == -ENOIOCTLCMD) ? 0 : __err;                            \
+})
+
+#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd, cond, o, \
+                                                f, args...);            \
 })
 
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). Ignore any errors. Note that you cannot add or delete
    a subdev while walking the subdevs list. */
-#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
-        __v4l2_device_call_subdevs(v4l2_dev,                            \
-                        !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
+                                                                        \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd,            \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+        } while (0)
 
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). If the callback returns an error other than 0 or
    -ENOIOCTLCMD, then return with that error code. Note that you cannot
    add or delete a subdev while walking the subdevs list. */
 #define v4l2_device_call_until_err(v4l2_dev, grpid, o, f, args...)      \
-        __v4l2_device_call_subdevs_until_err(v4l2_dev,                  \
-                       !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd,          \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+})
 
 #endif