media: replace all <spaces><tab> occurrences

There are a lot of places where sequences of space/tabs are
found. Get rid of all spaces before tabs.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

11 files changed, 231 insertions, 231 deletions

diff --git a/include/media/drv-intf/cx2341x.h b/include/media/drv-intf/cx2341x.h
index 9635eebaab09..33a97bfcea58 100644
--- a/include/media/drv-intf/cx2341x.h
+++ b/include/media/drv-intf/cx2341x.h
@@ -29,8 +29,8 @@ enum cx2341x_port {
 
 enum cx2341x_cap {
         CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
-        CX2341X_CAP_HAS_TS         = 1 << 1,
-        CX2341X_CAP_HAS_AC3        = 1 << 2,
+        CX2341X_CAP_HAS_TS         = 1 << 1,
+        CX2341X_CAP_HAS_AC3        = 1 << 2,
 };
 
 struct cx2341x_mpeg_params {
@@ -204,92 +204,92 @@ void cx2341x_handler_set_busy(struct cx2341x_handler *cxhdl, int busy);
 /* Firmware API commands */
 
 /* MPEG decoder API, specific to the cx23415 */
-#define CX2341X_DEC_PING_FW                     0x00
-#define CX2341X_DEC_START_PLAYBACK              0x01
-#define CX2341X_DEC_STOP_PLAYBACK               0x02
-#define CX2341X_DEC_SET_PLAYBACK_SPEED          0x03
-#define CX2341X_DEC_STEP_VIDEO                  0x05
-#define CX2341X_DEC_SET_DMA_BLOCK_SIZE          0x08
+#define CX2341X_DEC_PING_FW                     0x00
+#define CX2341X_DEC_START_PLAYBACK              0x01
+#define CX2341X_DEC_STOP_PLAYBACK               0x02
+#define CX2341X_DEC_SET_PLAYBACK_SPEED          0x03
+#define CX2341X_DEC_STEP_VIDEO                  0x05
+#define CX2341X_DEC_SET_DMA_BLOCK_SIZE          0x08
 #define CX2341X_DEC_GET_XFER_INFO               0x09
 #define CX2341X_DEC_GET_DMA_STATUS              0x0a
 #define CX2341X_DEC_SCHED_DMA_FROM_HOST         0x0b
-#define CX2341X_DEC_PAUSE_PLAYBACK              0x0d
-#define CX2341X_DEC_HALT_FW                     0x0e
-#define CX2341X_DEC_SET_STANDARD                0x10
+#define CX2341X_DEC_PAUSE_PLAYBACK              0x0d
+#define CX2341X_DEC_HALT_FW                     0x0e
+#define CX2341X_DEC_SET_STANDARD                0x10
 #define CX2341X_DEC_GET_VERSION                 0x11
-#define CX2341X_DEC_SET_STREAM_INPUT            0x14
-#define CX2341X_DEC_GET_TIMING_INFO             0x15
-#define CX2341X_DEC_SET_AUDIO_MODE              0x16
+#define CX2341X_DEC_SET_STREAM_INPUT            0x14
+#define CX2341X_DEC_GET_TIMING_INFO             0x15
+#define CX2341X_DEC_SET_AUDIO_MODE              0x16
 #define CX2341X_DEC_SET_EVENT_NOTIFICATION      0x17
 #define CX2341X_DEC_SET_DISPLAY_BUFFERS         0x18
-#define CX2341X_DEC_EXTRACT_VBI                 0x19
-#define CX2341X_DEC_SET_DECODER_SOURCE          0x1a
+#define CX2341X_DEC_EXTRACT_VBI                 0x19
+#define CX2341X_DEC_SET_DECODER_SOURCE          0x1a
 #define CX2341X_DEC_SET_PREBUFFERING            0x1e
 
 /* MPEG encoder API */
-#define CX2341X_ENC_PING_FW                     0x80
-#define CX2341X_ENC_START_CAPTURE               0x81
-#define CX2341X_ENC_STOP_CAPTURE                0x82
-#define CX2341X_ENC_SET_AUDIO_ID                0x89
-#define CX2341X_ENC_SET_VIDEO_ID                0x8b
-#define CX2341X_ENC_SET_PCR_ID                  0x8d
-#define CX2341X_ENC_SET_FRAME_RATE              0x8f
-#define CX2341X_ENC_SET_FRAME_SIZE              0x91
-#define CX2341X_ENC_SET_BIT_RATE                0x95
-#define CX2341X_ENC_SET_GOP_PROPERTIES          0x97
-#define CX2341X_ENC_SET_ASPECT_RATIO            0x99
-#define CX2341X_ENC_SET_DNR_FILTER_MODE         0x9b
-#define CX2341X_ENC_SET_DNR_FILTER_PROPS        0x9d
-#define CX2341X_ENC_SET_CORING_LEVELS           0x9f
-#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE     0xa1
-#define CX2341X_ENC_SET_VBI_LINE                0xb7
-#define CX2341X_ENC_SET_STREAM_TYPE             0xb9
-#define CX2341X_ENC_SET_OUTPUT_PORT             0xbb
-#define CX2341X_ENC_SET_AUDIO_PROPERTIES        0xbd
-#define CX2341X_ENC_HALT_FW                     0xc3
+#define CX2341X_ENC_PING_FW                     0x80
+#define CX2341X_ENC_START_CAPTURE               0x81
+#define CX2341X_ENC_STOP_CAPTURE                0x82
+#define CX2341X_ENC_SET_AUDIO_ID                0x89
+#define CX2341X_ENC_SET_VIDEO_ID                0x8b
+#define CX2341X_ENC_SET_PCR_ID                  0x8d
+#define CX2341X_ENC_SET_FRAME_RATE              0x8f
+#define CX2341X_ENC_SET_FRAME_SIZE              0x91
+#define CX2341X_ENC_SET_BIT_RATE                0x95
+#define CX2341X_ENC_SET_GOP_PROPERTIES          0x97
+#define CX2341X_ENC_SET_ASPECT_RATIO            0x99
+#define CX2341X_ENC_SET_DNR_FILTER_MODE         0x9b
+#define CX2341X_ENC_SET_DNR_FILTER_PROPS        0x9d
+#define CX2341X_ENC_SET_CORING_LEVELS           0x9f
+#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE     0xa1
+#define CX2341X_ENC_SET_VBI_LINE                0xb7
+#define CX2341X_ENC_SET_STREAM_TYPE             0xb9
+#define CX2341X_ENC_SET_OUTPUT_PORT             0xbb
+#define CX2341X_ENC_SET_AUDIO_PROPERTIES        0xbd
+#define CX2341X_ENC_HALT_FW                     0xc3
 #define CX2341X_ENC_GET_VERSION                 0xc4
-#define CX2341X_ENC_SET_GOP_CLOSURE             0xc5
-#define CX2341X_ENC_GET_SEQ_END                 0xc6
-#define CX2341X_ENC_SET_PGM_INDEX_INFO          0xc7
+#define CX2341X_ENC_SET_GOP_CLOSURE             0xc5
+#define CX2341X_ENC_GET_SEQ_END                 0xc6
+#define CX2341X_ENC_SET_PGM_INDEX_INFO          0xc7
 #define CX2341X_ENC_SET_VBI_CONFIG              0xc8
-#define CX2341X_ENC_SET_DMA_BLOCK_SIZE          0xc9
+#define CX2341X_ENC_SET_DMA_BLOCK_SIZE          0xc9
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_10     0xca
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_9      0xcb
-#define CX2341X_ENC_SCHED_DMA_TO_HOST           0xcc
-#define CX2341X_ENC_INITIALIZE_INPUT            0xcd
-#define CX2341X_ENC_SET_FRAME_DROP_RATE         0xd0
-#define CX2341X_ENC_PAUSE_ENCODER               0xd2
-#define CX2341X_ENC_REFRESH_INPUT               0xd3
+#define CX2341X_ENC_SCHED_DMA_TO_HOST           0xcc
+#define CX2341X_ENC_INITIALIZE_INPUT            0xcd
+#define CX2341X_ENC_SET_FRAME_DROP_RATE         0xd0
+#define CX2341X_ENC_PAUSE_ENCODER               0xd2
+#define CX2341X_ENC_REFRESH_INPUT               0xd3
 #define CX2341X_ENC_SET_COPYRIGHT               0xd4
-#define CX2341X_ENC_SET_EVENT_NOTIFICATION      0xd5
-#define CX2341X_ENC_SET_NUM_VSYNC_LINES         0xd6
-#define CX2341X_ENC_SET_PLACEHOLDER             0xd7
-#define CX2341X_ENC_MUTE_VIDEO                  0xd9
-#define CX2341X_ENC_MUTE_AUDIO                  0xda
+#define CX2341X_ENC_SET_EVENT_NOTIFICATION      0xd5
+#define CX2341X_ENC_SET_NUM_VSYNC_LINES         0xd6
+#define CX2341X_ENC_SET_PLACEHOLDER             0xd7
+#define CX2341X_ENC_MUTE_VIDEO                  0xd9
+#define CX2341X_ENC_MUTE_AUDIO                  0xda
 #define CX2341X_ENC_SET_VERT_CROP_LINE          0xdb
-#define CX2341X_ENC_MISC                        0xdc
+#define CX2341X_ENC_MISC                        0xdc
 
 /* OSD API, specific to the cx23415 */
-#define CX2341X_OSD_GET_FRAMEBUFFER             0x41
-#define CX2341X_OSD_GET_PIXEL_FORMAT            0x42
-#define CX2341X_OSD_SET_PIXEL_FORMAT            0x43
-#define CX2341X_OSD_GET_STATE                   0x44
-#define CX2341X_OSD_SET_STATE                   0x45
-#define CX2341X_OSD_GET_OSD_COORDS              0x46
-#define CX2341X_OSD_SET_OSD_COORDS              0x47
-#define CX2341X_OSD_GET_SCREEN_COORDS           0x48
-#define CX2341X_OSD_SET_SCREEN_COORDS           0x49
-#define CX2341X_OSD_GET_GLOBAL_ALPHA            0x4a
-#define CX2341X_OSD_SET_GLOBAL_ALPHA            0x4b
-#define CX2341X_OSD_SET_BLEND_COORDS            0x4c
-#define CX2341X_OSD_GET_FLICKER_STATE           0x4f
-#define CX2341X_OSD_SET_FLICKER_STATE           0x50
-#define CX2341X_OSD_BLT_COPY                    0x52
-#define CX2341X_OSD_BLT_FILL                    0x53
-#define CX2341X_OSD_BLT_TEXT                    0x54
-#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW      0x56
-#define CX2341X_OSD_SET_CHROMA_KEY              0x60
-#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX     0x61
-#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX     0x62
+#define CX2341X_OSD_GET_FRAMEBUFFER             0x41
+#define CX2341X_OSD_GET_PIXEL_FORMAT            0x42
+#define CX2341X_OSD_SET_PIXEL_FORMAT            0x43
+#define CX2341X_OSD_GET_STATE                   0x44
+#define CX2341X_OSD_SET_STATE                   0x45
+#define CX2341X_OSD_GET_OSD_COORDS              0x46
+#define CX2341X_OSD_SET_OSD_COORDS              0x47
+#define CX2341X_OSD_GET_SCREEN_COORDS           0x48
+#define CX2341X_OSD_SET_SCREEN_COORDS           0x49
+#define CX2341X_OSD_GET_GLOBAL_ALPHA            0x4a
+#define CX2341X_OSD_SET_GLOBAL_ALPHA            0x4b
+#define CX2341X_OSD_SET_BLEND_COORDS            0x4c
+#define CX2341X_OSD_GET_FLICKER_STATE           0x4f
+#define CX2341X_OSD_SET_FLICKER_STATE           0x50
+#define CX2341X_OSD_BLT_COPY                    0x52
+#define CX2341X_OSD_BLT_FILL                    0x53
+#define CX2341X_OSD_BLT_TEXT                    0x54
+#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW      0x56
+#define CX2341X_OSD_SET_CHROMA_KEY              0x60
+#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX     0x61
+#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX     0x62
 
 #endif /* CX2341X_H */
diff --git a/include/media/drv-intf/msp3400.h b/include/media/drv-intf/msp3400.h
index 1e6e80213a77..db98ce49e17b 100644
--- a/include/media/drv-intf/msp3400.h
+++ b/include/media/drv-intf/msp3400.h
@@ -80,17 +80,17 @@
  */
 
 /* SCART input to DSP selection */
-#define MSP_IN_SCART1           0  /* Pin SC1_IN */
-#define MSP_IN_SCART2           1  /* Pin SC2_IN */
-#define MSP_IN_SCART3           2  /* Pin SC3_IN */
-#define MSP_IN_SCART4           3  /* Pin SC4_IN */
-#define MSP_IN_MONO             6  /* Pin MONO_IN */
-#define MSP_IN_MUTE             7  /* Mute DSP input */
-#define MSP_SCART_TO_DSP(in)    (in)
+#define MSP_IN_SCART1           0  /* Pin SC1_IN */
+#define MSP_IN_SCART2           1  /* Pin SC2_IN */
+#define MSP_IN_SCART3           2  /* Pin SC3_IN */
+#define MSP_IN_SCART4           3  /* Pin SC4_IN */
+#define MSP_IN_MONO             6  /* Pin MONO_IN */
+#define MSP_IN_MUTE             7  /* Mute DSP input */
+#define MSP_SCART_TO_DSP(in)    (in)
 /* Tuner input to demodulator and DSP selection */
-#define MSP_IN_TUNER1           0  /* Analog Sound IF input pin ANA_IN1 */
-#define MSP_IN_TUNER2           1  /* Analog Sound IF input pin ANA_IN2 */
-#define MSP_TUNER_TO_DSP(in)    ((in) << 3)
+#define MSP_IN_TUNER1           0  /* Analog Sound IF input pin ANA_IN1 */
+#define MSP_IN_TUNER2           1  /* Analog Sound IF input pin ANA_IN2 */
+#define MSP_TUNER_TO_DSP(in)    ((in) << 3)
 
 /* The msp has up to 5 DSP outputs, each output can independently select
    a DSP input.
@@ -109,30 +109,30 @@
    DSP. This is currently not implemented. Also not implemented is the
    multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
    a need for one of those features then additional support can be added. */
-#define MSP_DSP_IN_TUNER        0  /* Tuner DSP input */
-#define MSP_DSP_IN_SCART        2  /* SCART DSP input */
-#define MSP_DSP_IN_I2S1         5  /* I2S1 DSP input */
-#define MSP_DSP_IN_I2S2         6  /* I2S2 DSP input */
-#define MSP_DSP_IN_I2S3         7  /* I2S3 DSP input */
-#define MSP_DSP_IN_MAIN_AVC     11 /* MAIN AVC processed DSP input */
-#define MSP_DSP_IN_MAIN         12 /* MAIN DSP input */
-#define MSP_DSP_IN_AUX          13 /* AUX DSP input */
-#define MSP_DSP_TO_MAIN(in)     ((in) << 4)
-#define MSP_DSP_TO_AUX(in)      ((in) << 8)
-#define MSP_DSP_TO_SCART1(in)   ((in) << 12)
-#define MSP_DSP_TO_SCART2(in)   ((in) << 16)
-#define MSP_DSP_TO_I2S(in)      ((in) << 20)
+#define MSP_DSP_IN_TUNER        0  /* Tuner DSP input */
+#define MSP_DSP_IN_SCART        2  /* SCART DSP input */
+#define MSP_DSP_IN_I2S1         5  /* I2S1 DSP input */
+#define MSP_DSP_IN_I2S2         6  /* I2S2 DSP input */
+#define MSP_DSP_IN_I2S3         7  /* I2S3 DSP input */
+#define MSP_DSP_IN_MAIN_AVC     11 /* MAIN AVC processed DSP input */
+#define MSP_DSP_IN_MAIN         12 /* MAIN DSP input */
+#define MSP_DSP_IN_AUX          13 /* AUX DSP input */
+#define MSP_DSP_TO_MAIN(in)     ((in) << 4)
+#define MSP_DSP_TO_AUX(in)      ((in) << 8)
+#define MSP_DSP_TO_SCART1(in)   ((in) << 12)
+#define MSP_DSP_TO_SCART2(in)   ((in) << 16)
+#define MSP_DSP_TO_I2S(in)      ((in) << 20)
 
 /* Output SCART select: the SCART outputs can select which input
    to use. */
-#define MSP_SC_IN_SCART1        0  /* SCART1 input, bypassing the DSP */
-#define MSP_SC_IN_SCART2        1  /* SCART2 input, bypassing the DSP */
-#define MSP_SC_IN_SCART3        2  /* SCART3 input, bypassing the DSP */
-#define MSP_SC_IN_SCART4        3  /* SCART4 input, bypassing the DSP */
-#define MSP_SC_IN_DSP_SCART1    4  /* DSP SCART1 input */
-#define MSP_SC_IN_DSP_SCART2    5  /* DSP SCART2 input */
-#define MSP_SC_IN_MONO          6  /* MONO input, bypassing the DSP */
-#define MSP_SC_IN_MUTE          7  /* MUTE output */
+#define MSP_SC_IN_SCART1        0  /* SCART1 input, bypassing the DSP */
+#define MSP_SC_IN_SCART2        1  /* SCART2 input, bypassing the DSP */
+#define MSP_SC_IN_SCART3        2  /* SCART3 input, bypassing the DSP */
+#define MSP_SC_IN_SCART4        3  /* SCART4 input, bypassing the DSP */
+#define MSP_SC_IN_DSP_SCART1    4  /* DSP SCART1 input */
+#define MSP_SC_IN_DSP_SCART2    5  /* DSP SCART2 input */
+#define MSP_SC_IN_MONO          6  /* MONO input, bypassing the DSP */
+#define MSP_SC_IN_MUTE          7  /* MUTE output */
 #define MSP_SC_TO_SCART1(in)    (in)
 #define MSP_SC_TO_SCART2(in)    ((in) << 4)
 
diff --git a/include/media/drv-intf/saa7146.h b/include/media/drv-intf/saa7146.h
index 769c6cf7eb4c..a7bf2c4a2e4d 100644
--- a/include/media/drv-intf/saa7146.h
+++ b/include/media/drv-intf/saa7146.h
@@ -118,7 +118,7 @@ struct saa7146_dev
 {
         struct module                   *module;
 
-        struct v4l2_device              v4l2_dev;
+        struct v4l2_device              v4l2_dev;
         struct v4l2_ctrl_handler        ctrl_handler;
 
         /* different device locks */
diff --git a/include/media/i2c/bt819.h b/include/media/i2c/bt819.h
index 8025f4bc2bb6..1bcf0dbeb516 100644
--- a/include/media/i2c/bt819.h
+++ b/include/media/i2c/bt819.h
@@ -30,7 +30,7 @@
 
    Note: these ioctls that internal to the kernel and are never called
    from userspace. */
-#define BT819_FIFO_RESET_LOW    _IO('b', 0)
-#define BT819_FIFO_RESET_HIGH   _IO('b', 1)
+#define BT819_FIFO_RESET_LOW    _IO('b', 0)
+#define BT819_FIFO_RESET_HIGH   _IO('b', 1)
 
 #endif
diff --git a/include/media/i2c/m52790.h b/include/media/i2c/m52790.h
index 7ddffae31a67..8d9db3cf6fab 100644
--- a/include/media/i2c/m52790.h
+++ b/include/media/i2c/m52790.h
@@ -23,57 +23,57 @@
 
 /* Input routing switch 1 */
 
-#define M52790_SW1_IN_MASK      0x0003
-#define M52790_SW1_IN_TUNER     0x0000
-#define M52790_SW1_IN_V2        0x0001
-#define M52790_SW1_IN_V3        0x0002
-#define M52790_SW1_IN_V4        0x0003
+#define M52790_SW1_IN_MASK      0x0003
+#define M52790_SW1_IN_TUNER     0x0000
+#define M52790_SW1_IN_V2        0x0001
+#define M52790_SW1_IN_V3        0x0002
+#define M52790_SW1_IN_V4        0x0003
 
 /* Selects component input instead of composite */
-#define M52790_SW1_YCMIX        0x0004
+#define M52790_SW1_YCMIX        0x0004
 
 
 /* Input routing switch 2 */
 
-#define M52790_SW2_IN_MASK      0x0300
-#define M52790_SW2_IN_TUNER     0x0000
-#define M52790_SW2_IN_V2        0x0100
-#define M52790_SW2_IN_V3        0x0200
-#define M52790_SW2_IN_V4        0x0300
+#define M52790_SW2_IN_MASK      0x0300
+#define M52790_SW2_IN_TUNER     0x0000
+#define M52790_SW2_IN_V2        0x0100
+#define M52790_SW2_IN_V3        0x0200
+#define M52790_SW2_IN_V4        0x0300
 
 /* Selects component input instead of composite */
-#define M52790_SW2_YCMIX        0x0400
+#define M52790_SW2_YCMIX        0x0400
 
 
 /* Output routing switch 1 */
 
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW1_V_AMP        0x0008
+#define M52790_SW1_V_AMP        0x0008
 
 /* Enable 6dB amplifier for component out */
-#define M52790_SW1_YC_AMP       0x0010
+#define M52790_SW1_YC_AMP       0x0010
 
 /* Audio output mode */
-#define M52790_SW1_AUDIO_MASK   0x00c0
-#define M52790_SW1_AUDIO_MUTE   0x0000
-#define M52790_SW1_AUDIO_R      0x0040
-#define M52790_SW1_AUDIO_L      0x0080
+#define M52790_SW1_AUDIO_MASK   0x00c0
+#define M52790_SW1_AUDIO_MUTE   0x0000
+#define M52790_SW1_AUDIO_R      0x0040
+#define M52790_SW1_AUDIO_L      0x0080
 #define M52790_SW1_AUDIO_STEREO 0x00c0
 
 
 /* Output routing switch 2 */
 
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW2_V_AMP        0x0800
+#define M52790_SW2_V_AMP        0x0800
 
 /* Enable 6dB amplifier for component out */
-#define M52790_SW2_YC_AMP       0x1000
+#define M52790_SW2_YC_AMP       0x1000
 
 /* Audio output mode */
-#define M52790_SW2_AUDIO_MASK   0xc000
-#define M52790_SW2_AUDIO_MUTE   0x0000
-#define M52790_SW2_AUDIO_R      0x4000
-#define M52790_SW2_AUDIO_L      0x8000
+#define M52790_SW2_AUDIO_MASK   0xc000
+#define M52790_SW2_AUDIO_MUTE   0x0000
+#define M52790_SW2_AUDIO_R      0x4000
+#define M52790_SW2_AUDIO_L      0x8000
 #define M52790_SW2_AUDIO_STEREO 0xc000
 
 
@@ -83,9 +83,9 @@
 #define M52790_IN_V3    (M52790_SW1_IN_V3 | M52790_SW2_IN_V3)
 #define M52790_IN_V4    (M52790_SW1_IN_V4 | M52790_SW2_IN_V4)
 
-#define M52790_OUT_STEREO       (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_STEREO       (M52790_SW1_AUDIO_STEREO | \
                                  M52790_SW2_AUDIO_STEREO)
-#define M52790_OUT_AMP_STEREO   (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_AMP_STEREO   (M52790_SW1_AUDIO_STEREO | \
                                  M52790_SW1_V_AMP | \
                                  M52790_SW2_AUDIO_STEREO | \
                                  M52790_SW2_V_AMP)
diff --git a/include/media/i2c/saa7115.h b/include/media/i2c/saa7115.h
index 53954c90e7f6..a0cda423509d 100644
--- a/include/media/i2c/saa7115.h
+++ b/include/media/i2c/saa7115.h
@@ -36,15 +36,15 @@
 #define SAA7115_SVIDEO3    9
 
 /* outputs */
-#define SAA7115_IPORT_ON        1
-#define SAA7115_IPORT_OFF       0
+#define SAA7115_IPORT_ON        1
+#define SAA7115_IPORT_OFF       0
 
 /* SAA7111 specific outputs. */
-#define SAA7111_VBI_BYPASS      2
+#define SAA7111_VBI_BYPASS      2
 #define SAA7111_FMT_YUV422      0x00
-#define SAA7111_FMT_RGB         0x40
-#define SAA7111_FMT_CCIR        0x80
-#define SAA7111_FMT_YUV411      0xc0
+#define SAA7111_FMT_RGB         0x40
+#define SAA7111_FMT_CCIR        0x80
+#define SAA7111_FMT_YUV411      0xc0
 
 /* config flags */
 /*
diff --git a/include/media/i2c/upd64031a.h b/include/media/i2c/upd64031a.h
index 48ec03c4ef23..1eba24dfee48 100644
--- a/include/media/i2c/upd64031a.h
+++ b/include/media/i2c/upd64031a.h
@@ -18,9 +18,9 @@
 #define _UPD64031A_H_
 
 /* Ghost reduction modes */
-#define UPD64031A_GR_ON         0
-#define UPD64031A_GR_OFF        1
-#define UPD64031A_GR_THROUGH    3
+#define UPD64031A_GR_ON         0
+#define UPD64031A_GR_OFF        1
+#define UPD64031A_GR_THROUGH    3
 
 /* Direct 3D/YCS Connection */
 #define UPD64031A_3DYCS_DISABLE   (0 << 2)
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 7fc0bc6b8007..e0d95a7c5d48 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -50,7 +50,7 @@
 /* These three macros assume that the debug level is set with a module
    parameter called 'debug'. */
 #define v4l_dbg(level, debug, client, fmt, arg...)                           \
-        do {                                                                 \
+        do {                                                                 \
                 if (debug >= (level))                                        \
                         v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
         } while (0)
@@ -80,9 +80,9 @@
 /* These three macros assume that the debug level is set with a module
    parameter called 'debug'. */
 #define v4l2_dbg(level, debug, dev, fmt, arg...)                        \
-        do {                                                            \
+        do {                                                            \
                 if (debug >= (level))                                   \
-                        v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
+                        v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
         } while (0)
 
 /**
@@ -266,7 +266,7 @@ struct v4l2_priv_tun_config {
 };
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
 
-#define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
+#define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/include/uapi/linux/dvb/video.h b/include/uapi/linux/dvb/video.h
index 4d51f98182bb..df3d7028c807 100644
--- a/include/uapi/linux/dvb/video.h
+++ b/include/uapi/linux/dvb/video.h
@@ -83,11 +83,11 @@ typedef enum {
 #define VIDEO_CMD_CONTINUE    (3)
 
 /* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
+#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
 
 /* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
+#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
+#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
 
 /* Play input formats: */
 /* The decoder has no special format requirements */
@@ -124,8 +124,8 @@ struct video_command {
 /* FIELD_UNKNOWN can be used if the hardware does not know whether
    the Vsync is for an odd, even or progressive (i.e. non-interlaced)
    field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
-#define VIDEO_VSYNC_FIELD_ODD           (1)
+#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
+#define VIDEO_VSYNC_FIELD_ODD           (1)
 #define VIDEO_VSYNC_FIELD_EVEN          (2)
 #define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)
 
@@ -133,8 +133,8 @@ struct video_event {
         __s32 type;
 #define VIDEO_EVENT_SIZE_CHANGED        1
 #define VIDEO_EVENT_FRAME_RATE_CHANGED  2
-#define VIDEO_EVENT_DECODER_STOPPED     3
-#define VIDEO_EVENT_VSYNC               4
+#define VIDEO_EVENT_DECODER_STOPPED     3
+#define VIDEO_EVENT_VSYNC               4
         /* unused, make sure to use atomic time for y2038 if it ever gets used */
         long timestamp;
         union {
@@ -268,9 +268,9 @@ typedef __u16 video_attributes_t;
 #define VIDEO_GET_PTS              _IOR('o', 57, __u64)
 
 /* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
+#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
 
-#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
+#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
+#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
 
 #endif /* _UAPI_DVBVIDEO_H_ */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index a692623e0236..cbbb750d87d1 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -67,8 +67,8 @@
 /* User-class control IDs */
 
 #define V4L2_CID_BASE                   (V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE              V4L2_CID_BASE
-#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_USER_BASE              V4L2_CID_BASE
+#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
 #define V4L2_CID_BRIGHTNESS             (V4L2_CID_BASE+0)
 #define V4L2_CID_CONTRAST               (V4L2_CID_BASE+1)
 #define V4L2_CID_SATURATION             (V4L2_CID_BASE+2)
@@ -102,7 +102,7 @@ enum v4l2_power_line_frequency {
 #define V4L2_CID_HUE_AUTO                       (V4L2_CID_BASE+25)
 #define V4L2_CID_WHITE_BALANCE_TEMPERATURE      (V4L2_CID_BASE+26)
 #define V4L2_CID_SHARPNESS                      (V4L2_CID_BASE+27)
-#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
+#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
 #define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
 #define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
 #define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
@@ -194,11 +194,11 @@ enum v4l2_colorfx {
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
 
-#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
-#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
+#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
 
 /*  MPEG streams, specific to multiplexed streams */
-#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
+#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
 enum v4l2_mpeg_stream_type {
         V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
         V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
@@ -207,26 +207,26 @@ enum v4l2_mpeg_stream_type {
         V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
         V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
 };
-#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
-#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
-#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
-#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
-#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
+#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
 enum v4l2_mpeg_stream_vbi_fmt {
         V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
         V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
 };
 
 /*  MPEG audio controls specific to multiplexed streams  */
-#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
 enum v4l2_mpeg_audio_sampling_freq {
         V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
         V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
         V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
+#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
 enum v4l2_mpeg_audio_encoding {
         V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
         V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
@@ -234,7 +234,7 @@ enum v4l2_mpeg_audio_encoding {
         V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
         V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
 };
-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
 enum v4l2_mpeg_audio_l1_bitrate {
         V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
         V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
@@ -251,7 +251,7 @@ enum v4l2_mpeg_audio_l1_bitrate {
         V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
         V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
 enum v4l2_mpeg_audio_l2_bitrate {
         V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
         V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
@@ -268,7 +268,7 @@ enum v4l2_mpeg_audio_l2_bitrate {
         V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
         V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
 enum v4l2_mpeg_audio_l3_bitrate {
         V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
         V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
@@ -285,32 +285,32 @@ enum v4l2_mpeg_audio_l3_bitrate {
         V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
         V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
+#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
 enum v4l2_mpeg_audio_mode {
         V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
         V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
         V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
         V4L2_MPEG_AUDIO_MODE_MONO         = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
 enum v4l2_mpeg_audio_mode_extension {
         V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
         V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
         V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
         V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
 enum v4l2_mpeg_audio_emphasis {
         V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
         V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
         V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
+#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
 enum v4l2_mpeg_audio_crc {
         V4L2_MPEG_AUDIO_CRC_NONE  = 0,
         V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
 };
-#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
 #define V4L2_CID_MPEG_AUDIO_AAC_BITRATE         (V4L2_CID_MPEG_BASE+110)
 #define V4L2_CID_MPEG_AUDIO_AC3_BITRATE         (V4L2_CID_MPEG_BASE+111)
 enum v4l2_mpeg_audio_ac3_bitrate {
@@ -346,33 +346,33 @@ enum v4l2_mpeg_audio_dec_playback {
 #define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
 
 /*  MPEG video controls specific to multiplexed streams */
-#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
+#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
 enum v4l2_mpeg_video_encoding {
         V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
         V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
         V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
 };
-#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
+#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
 enum v4l2_mpeg_video_aspect {
         V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
         V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
         V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
         V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
 };
-#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
-#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
 enum v4l2_mpeg_video_bitrate_mode {
         V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
         V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
 };
-#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
 #define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
+#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
 #define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE             (V4L2_CID_MPEG_BASE+212)
 #define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER        (V4L2_CID_MPEG_BASE+213)
 #define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB             (V4L2_CID_MPEG_BASE+214)
@@ -590,14 +590,14 @@ enum v4l2_vp8_golden_frame_sel {
 #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE                 (V4L2_CID_MPEG_BASE+511)
 
 /*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
+#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
 enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
         V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
         V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
 enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
         V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
         V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
@@ -605,18 +605,18 @@ enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
         V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
         V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
 enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
         V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
         V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
 enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
         V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
         V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
 enum v4l2_mpeg_cx2341x_video_median_filter_type {
         V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
         V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
@@ -624,11 +624,11 @@ enum v4l2_mpeg_cx2341x_video_median_filter_type {
         V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
         V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
 #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
-#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
 
 /*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
 #define V4L2_CID_MPEG_MFC51_BASE                                (V4L2_CTRL_CLASS_MPEG | 0x1100)
@@ -660,8 +660,8 @@ enum v4l2_mpeg_mfc51_video_force_frame_type {
 
 /*  Camera class control IDs */
 
-#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
-#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
+#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
 
 #define V4L2_CID_EXPOSURE_AUTO                  (V4L2_CID_CAMERA_CLASS_BASE+1)
 enum  v4l2_exposure_auto_type {
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index faa97fda588a..982718965180 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -107,14 +107,14 @@ enum v4l2_field {
                                          transmitted first */
 };
 #define V4L2_FIELD_HAS_TOP(field)       \
-        ((field) == V4L2_FIELD_TOP      ||\
+        ((field) == V4L2_FIELD_TOP      ||\
          (field) == V4L2_FIELD_INTERLACED ||\
          (field) == V4L2_FIELD_INTERLACED_TB ||\
          (field) == V4L2_FIELD_INTERLACED_BT ||\
          (field) == V4L2_FIELD_SEQ_TB   ||\
          (field) == V4L2_FIELD_SEQ_BT)
 #define V4L2_FIELD_HAS_BOTTOM(field)    \
-        ((field) == V4L2_FIELD_BOTTOM   ||\
+        ((field) == V4L2_FIELD_BOTTOM   ||\
          (field) == V4L2_FIELD_INTERLACED ||\
          (field) == V4L2_FIELD_INTERLACED_TB ||\
          (field) == V4L2_FIELD_INTERLACED_BT ||\
@@ -467,12 +467,12 @@ struct v4l2_capability {
  *      V I D E O   I M A G E   F O R M A T
  */
 struct v4l2_pix_format {
-        __u32                   width;
+        __u32                   width;
         __u32                   height;
         __u32                   pixelformat;
         __u32                   field;          /* enum v4l2_field */
-        __u32                   bytesperline;   /* for padding, zero if unused */
-        __u32                   sizeimage;
+        __u32                   bytesperline;   /* for padding, zero if unused */
+        __u32                   sizeimage;
         __u32                   colorspace;     /* enum v4l2_colorspace */
         __u32                   priv;           /* private data, depends on pixelformat */
         __u32                   flags;          /* format flags (V4L2_PIX_FMT_FLAG_*) */
@@ -1173,7 +1173,7 @@ typedef __u64 v4l2_std_id;
                                  V4L2_STD_NTSC_M_JP     |\
                                  V4L2_STD_NTSC_M_KR)
 /* Secam macros */
-#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
+#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
                                  V4L2_STD_SECAM_K       |\
                                  V4L2_STD_SECAM_K1)
 /* All Secam Standards */
@@ -1254,7 +1254,7 @@ struct v4l2_standard {
 };
 
 /*
- *      D V     B T     T I M I N G S
+ *      D V     B T     T I M I N G S
  */
 
 /** struct v4l2_bt_timings - BT.656/BT.1120 timing data
@@ -1595,7 +1595,7 @@ struct v4l2_ext_controls {
         struct v4l2_ext_control *controls;
 };
 
-#define V4L2_CTRL_ID_MASK         (0x0fffffff)
+#define V4L2_CTRL_ID_MASK         (0x0fffffff)
 #ifndef __KERNEL__
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
 #endif
@@ -1667,11 +1667,11 @@ struct v4l2_querymenu {
 /*  Control flags  */
 #define V4L2_CTRL_FLAG_DISABLED         0x0001
 #define V4L2_CTRL_FLAG_GRABBED          0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
-#define V4L2_CTRL_FLAG_UPDATE           0x0008
-#define V4L2_CTRL_FLAG_INACTIVE         0x0010
-#define V4L2_CTRL_FLAG_SLIDER           0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
+#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
+#define V4L2_CTRL_FLAG_UPDATE           0x0008
+#define V4L2_CTRL_FLAG_INACTIVE         0x0010
+#define V4L2_CTRL_FLAG_SLIDER           0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
 #define V4L2_CTRL_FLAG_VOLATILE         0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD      0x0100
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
@@ -1785,21 +1785,21 @@ struct v4l2_hw_freq_seek {
  */
 
 struct v4l2_rds_data {
-        __u8    lsb;
-        __u8    msb;
-        __u8    block;
+        __u8    lsb;
+        __u8    msb;
+        __u8    block;
 } __attribute__ ((packed));
 
-#define V4L2_RDS_BLOCK_MSK       0x7
-#define V4L2_RDS_BLOCK_A         0
-#define V4L2_RDS_BLOCK_B         1
-#define V4L2_RDS_BLOCK_C         2
-#define V4L2_RDS_BLOCK_D         3
-#define V4L2_RDS_BLOCK_C_ALT     4
-#define V4L2_RDS_BLOCK_INVALID   7
+#define V4L2_RDS_BLOCK_MSK       0x7
+#define V4L2_RDS_BLOCK_A         0
+#define V4L2_RDS_BLOCK_B         1
+#define V4L2_RDS_BLOCK_C         2
+#define V4L2_RDS_BLOCK_D         3
+#define V4L2_RDS_BLOCK_C_ALT     4
+#define V4L2_RDS_BLOCK_INVALID   7
 
 #define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR     0x80
+#define V4L2_RDS_BLOCK_ERROR     0x80
 
 /*
  *      A U D I O
@@ -2355,8 +2355,8 @@ struct v4l2_create_buffers {
 #define VIDIOC_S_CROP            _IOW('V', 60, struct v4l2_crop)
 #define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct v4l2_jpegcompression)
 #define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
 #define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
 #define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
 #define VIDIOC_G_PRIORITY        _IOR('V', 67, __u32) /* enum v4l2_priority */
@@ -2377,8 +2377,8 @@ struct v4l2_create_buffers {
  * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
  * You must be root to use these ioctls. Never use these in applications!
  */
-#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
-#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
 
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
 #define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)