[media] media: cx18, ivtv: eliminate unnecessary array index checks

The idx values passed to cx18_i2c_register() and ivtv_i2c_register()
by cx18_init_subdevs() and ivtv_load_and_init_modules() respectively
are always in-range, based on how the hw_all bitmask is populated.
Previously, the checks were already ineffective because arrays were
being dereferenced using the index before the check.

Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 0 insertions, 5 deletions

diff --git a/drivers/media/pci/cx18/cx18-i2c.c b/drivers/media/pci/cx18/cx18-i2c.c
index d61ac6393e7e..4af8cd6df95d 100644
--- a/drivers/media/pci/cx18/cx18-i2c.c
+++ b/drivers/media/pci/cx18/cx18-i2c.c
@@ -116,9 +116,6 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
         const char *type = hw_devicenames[idx];
         u32 hw = 1 << idx;
 
-        if (idx >= ARRAY_SIZE(hw_addrs))
-                return -1;
-
         if (hw == CX18_HW_TUNER) {
                 /* special tuner group handling */
                 sd = v4l2_i2c_new_subdev(&cx->v4l2_dev,
diff --git a/drivers/media/pci/ivtv/ivtv-i2c.c b/drivers/media/pci/ivtv/ivtv-i2c.c
index a1811054fde4..ceed2d87abfd 100644
--- a/drivers/media/pci/ivtv/ivtv-i2c.c
+++ b/drivers/media/pci/ivtv/ivtv-i2c.c
@@ -267,8 +267,6 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
         const char *type = hw_devicenames[idx];
         u32 hw = 1 << idx;
 
-        if (idx >= ARRAY_SIZE(hw_addrs))
-                return -1;
         if (hw == IVTV_HW_TUNER) {
                 /* special tuner handling */
                 sd = v4l2_i2c_new_subdev(&itv->v4l2_dev, adap, type, 0,