Commit db9c9ee4 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Fix spacing around operators 



Fix checkpatch warnings over spaces around operators.
Many were around operations that can be replaced with the
BIT(x) macro, so replace with that where appropriate.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98fbcbb1

drivers/staging/vc04_services/bcm2835-camera/controls.c

+16 −16
Original line number Diff line number Diff line
@@ -1130,10 +1130,10 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	{

		V4L2_CID_MPEG_VIDEO_H264_PROFILE,

		MMAL_CONTROL_TYPE_STD_MENU,

		~((1<<V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |

			(1<<V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),

		~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |

		  BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),

		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,

		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, 1, NULL,

		MMAL_PARAMETER_PROFILE,
@@ -1142,18 +1142,18 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	},

	{

		V4L2_CID_MPEG_VIDEO_H264_LEVEL, MMAL_CONTROL_TYPE_STD_MENU,

		~((1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1B) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |

			(1<<V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),

		~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |

		  BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),

		V4L2_MPEG_VIDEO_H264_LEVEL_4_0,

		V4L2_MPEG_VIDEO_H264_LEVEL_4_0, 1, NULL,

		MMAL_PARAMETER_PROFILE,

drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ struct mmal_msg_port_action_reply { 
#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)

/* Signals that the current payload contains only complete frames (>1) */

#define MMAL_BUFFER_HEADER_FLAG_FRAME                  \

	(MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)

	(MMAL_BUFFER_HEADER_FLAG_FRAME_START | \

	 MMAL_BUFFER_HEADER_FLAG_FRAME_END)

/* Signals that the current payload is a keyframe (i.e. self decodable) */

#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               BIT(3)

/*

drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h

+6 −6

File changed.

Contains only whitespace changes.