3 files changed, 18 insertions, 25 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)
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 73ce90c2f577..a09caf883170 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -71,19 +71,6 @@ static const u8 hw_bus[] = {
 };
 
 /* This array should match the CX18_HW_ defines */
-static const char * const hw_modules[] = {
-        "tuner",        /* CX18_HW_TUNER */
-        NULL,           /* CX18_HW_TVEEPROM */
-        "cs5345",       /* CX18_HW_CS5345 */
-        NULL,           /* CX18_HW_DVB */
-        NULL,           /* CX18_HW_418_AV */
-        NULL,           /* CX18_HW_GPIO_MUX */
-        NULL,           /* CX18_HW_GPIO_RESET_CTRL */
-        NULL,           /* CX18_HW_Z8F0811_IR_TX_HAUP */
-        NULL,           /* CX18_HW_Z8F0811_IR_RX_HAUP */
-};
-
-/* This array should match the CX18_HW_ defines */
 static const char * const hw_devicenames[] = {
         "tuner",
         "tveeprom",
@@ -126,7 +113,6 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
         struct v4l2_subdev *sd;
         int bus = hw_bus[idx];
         struct i2c_adapter *adap = &cx->i2c_adap[bus];
-        const char *mod = hw_modules[idx];
         const char *type = hw_devicenames[idx];
         u32 hw = 1 << idx;
 
@@ -136,15 +122,15 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
         if (hw == CX18_HW_TUNER) {
                 /* special tuner group handling */
                 sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
-                                adap, mod, type, 0, cx->card_i2c->radio);
+                                adap, NULL, type, 0, cx->card_i2c->radio);
                 if (sd != NULL)
                         sd->grp_id = hw;
                 sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
-                                adap, mod, type, 0, cx->card_i2c->demod);
+                                adap, NULL, type, 0, cx->card_i2c->demod);
                 if (sd != NULL)
                         sd->grp_id = hw;
                 sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
-                                adap, mod, type, 0, cx->card_i2c->tv);
+                                adap, NULL, type, 0, cx->card_i2c->tv);
                 if (sd != NULL)
                         sd->grp_id = hw;
                 return sd != NULL ? 0 : -1;
@@ -158,7 +144,8 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
                 return -1;
 
         /* It's an I2C device other than an analog tuner or IR chip */
-        sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx], NULL);
+        sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, NULL, type, hw_addrs[idx],
+                                 NULL);
         if (sd != NULL)
                 sd->grp_id = hw;
         return sd != NULL ? 0 : -1;
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index d6792405f8d3..7150195740dc 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -40,7 +40,6 @@
 #include "cx18-av-core.h"
 #include <media/tveeprom.h>
 #include <media/v4l2-chip-ident.h>
-#include <linux/i2c-id.h>
 
 u16 cx18_service2vbi(int type)
 {