v4l2-dbg: fix initializers and remove unused variable.

v4l2-dbg now compiles with -Wextra without warnings.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/utils/v4l2-dbg/v4l2-dbg-micron.h b/utils/v4l2-dbg/v4l2-dbg-micron.h
index 8466322..e92f3eb 100644 (file)
--- a/utils/v4l2-dbg/v4l2-dbg-micron.h
+++ b/utils/v4l2-dbg/v4l2-dbg-micron.h
@@ -22,25 +22,25 @@
 #define MT9V011_PREFIX "MT9V011_"
 
 static struct board_regs mt9v011_regs[] = {
-       {0x00, MT9V011_PREFIX "CHIP_VERSION"},
-       {0x01, MT9V011_PREFIX "ROWSTART"},
-       {0x02, MT9V011_PREFIX "COLSTART"},
-       {0x03, MT9V011_PREFIX "HEIGHT"},
-       {0x04, MT9V011_PREFIX "WIDTH"},
-       {0x05, MT9V011_PREFIX "HBLANK"},
-       {0x06, MT9V011_PREFIX "VBLANK"},
-       {0x07, MT9V011_PREFIX "OUT_CTRL"},
-       {0x09, MT9V011_PREFIX "SHUTTER_WIDTH"},
-       {0x0a, MT9V011_PREFIX "CLK_SPEED"},
-       {0x0b, MT9V011_PREFIX "RESTART"},
-       {0x0c, MT9V011_PREFIX "SHUTTER_DELAY"},
-       {0x0d, MT9V011_PREFIX "RESET"},
-       {0x1e, MT9V011_PREFIX "DIGITAL_ZOOM"},
-       {0x20, MT9V011_PREFIX "READ_MODE"},
-       {0x2b, MT9V011_PREFIX "GREEN_1_GAIN"},
-       {0x2c, MT9V011_PREFIX "BLUE_GAIN"},
-       {0x2d, MT9V011_PREFIX "RED_GAIN"},
-       {0x2e, MT9V011_PREFIX "GREEN_2_GAIN"},
-       {0x35, MT9V011_PREFIX "GLOBAL_GAIN"},
-       {0xf1, MT9V011_PREFIX "CHIP_ENABLE"},
+       {0x00, MT9V011_PREFIX "CHIP_VERSION", 0},
+       {0x01, MT9V011_PREFIX "ROWSTART", 0},
+       {0x02, MT9V011_PREFIX "COLSTART", 0},
+       {0x03, MT9V011_PREFIX "HEIGHT", 0},
+       {0x04, MT9V011_PREFIX "WIDTH", 0},
+       {0x05, MT9V011_PREFIX "HBLANK", 0},
+       {0x06, MT9V011_PREFIX "VBLANK", 0},
+       {0x07, MT9V011_PREFIX "OUT_CTRL", 0},
+       {0x09, MT9V011_PREFIX "SHUTTER_WIDTH", 0},
+       {0x0a, MT9V011_PREFIX "CLK_SPEED", 0},
+       {0x0b, MT9V011_PREFIX "RESTART", 0},
+       {0x0c, MT9V011_PREFIX "SHUTTER_DELAY", 0},
+       {0x0d, MT9V011_PREFIX "RESET", 0},
+       {0x1e, MT9V011_PREFIX "DIGITAL_ZOOM", 0},
+       {0x20, MT9V011_PREFIX "READ_MODE", 0},
+       {0x2b, MT9V011_PREFIX "GREEN_1_GAIN", 0},
+       {0x2c, MT9V011_PREFIX "BLUE_GAIN", 0},
+       {0x2d, MT9V011_PREFIX "RED_GAIN", 0},
+       {0x2e, MT9V011_PREFIX "GREEN_2_GAIN", 0},
+       {0x35, MT9V011_PREFIX "GLOBAL_GAIN", 0},
+       {0xf1, MT9V011_PREFIX "CHIP_ENABLE", 0},
 };

diff --git a/utils/v4l2-dbg/v4l2-dbg.cpp b/utils/v4l2-dbg/v4l2-dbg.cpp
index cf306a8..a4cd276 100644 (file)
--- a/utils/v4l2-dbg/v4l2-dbg.cpp
+++ b/utils/v4l2-dbg/v4l2-dbg.cpp
@@ -620,8 +620,6 @@ int main(int argc, char **argv)
        }
 
        if (options[OptGetRegister]) {
-               int stride = 1;
-
                get_reg.match = match;
                printf("ioctl: VIDIOC_DBG_G_REGISTER\n");