Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b0a78d authored by Eric Anholt's avatar Eric Anholt Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-v4l2: Apply many whitespace fixes from checkpatch. 



Generated with checkpatch.pl --fix-inplace, some manual fixes for
cases where checkpatch fixed one out of multiple lines of mis-indented
function parameters, and then git add -p out of the results.

I skipped some fixes that should probably instead be replaced with the
BIT() macro.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7002786a

drivers/staging/media/platform/bcm2835/bcm2835-camera.c

+49 −41
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
static int enable_camera(struct bm2835_mmal_dev *dev)

{

	int ret;



	if (!dev->camera_use_count) {

		ret = vchiq_mmal_port_parameter_set(

			dev->instance,
@@ -451,6 +452,7 @@ static int enable_camera(struct bm2835_mmal_dev *dev) 
static int disable_camera(struct bm2835_mmal_dev *dev)

{

	int ret;



	if (!dev->camera_use_count) {

		v4l2_err(&dev->v4l2_dev,

			 "Disabled the camera when already disabled\n");
@@ -459,6 +461,7 @@ static int disable_camera(struct bm2835_mmal_dev *dev) 
	dev->camera_use_count--;

	if (!dev->camera_use_count) {

		unsigned int i = 0xFFFFFFFF;



		v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

			 "Disabling camera\n");

		ret =
@@ -643,12 +646,14 @@ static void stop_streaming(struct vb2_queue *vq) 
static void bm2835_mmal_lock(struct vb2_queue *vq)

{

	struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);



	mutex_lock(&dev->mutex);

}



static void bm2835_mmal_unlock(struct vb2_queue *vq)

{

	struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);



	mutex_unlock(&dev->mutex);

}
@@ -771,6 +776,7 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) 
	struct bm2835_mmal_dev *dev = video_drvdata(file);

	struct vchiq_mmal_port *src;

	struct vchiq_mmal_port *dst;



	if ((on && dev->component[MMAL_COMPONENT_PREVIEW]->enabled) ||

	    (!on && !dev->component[MMAL_COMPONENT_PREVIEW]->enabled))

		return 0;	/* already in requested state */
@@ -1755,6 +1761,7 @@ static int __init mmal_init(struct bm2835_mmal_dev *dev) 


	{

		unsigned int enable = 1;



		vchiq_mmal_port_parameter_set(

			dev->instance,

			&dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->control,
@@ -1829,7 +1836,8 @@ static int __init bm2835_mmal_init_device(struct bm2835_mmal_dev *dev, 


	v4l2_info(vfd->v4l2_dev,

		  "V4L2 device registered as %s - stills mode > %dx%d\n",

		video_device_node_name(vfd), max_video_width, max_video_height);

		  video_device_node_name(vfd),

		  max_video_width, max_video_height);



	return 0;

}

drivers/staging/media/platform/bcm2835/controls.c

+113 −123
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static int ctrl_set_flip(struct bm2835_mmal_dev *dev, 
					    &u32_value, sizeof(u32_value));



	return ret;



}



static int ctrl_set_exposure(struct bm2835_mmal_dev *dev,
@@ -403,7 +402,6 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev, 
		dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;

		break;

	*/



	}



	if (dev->scene_mode == V4L2_SCENE_MODE_NONE) {
@@ -497,7 +495,6 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev, 
	case V4L2_WHITE_BALANCE_SHADE:

		u32_value = MMAL_PARAM_AWBMODE_SHADE;

		break;



	}



	return vchiq_mmal_port_parameter_set(dev->instance, control,
@@ -539,7 +536,6 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev, 


	for (i = 0; i < ARRAY_SIZE(v4l2_to_mmal_effects_values); i++) {

		if (ctrl->val == v4l2_to_mmal_effects_values[i].v4l2_effect) {



			imagefx.effect =

				v4l2_to_mmal_effects_values[i].mmal_effect;

			imagefx.num_effect_params =
@@ -601,7 +597,8 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev, 


	ret = vchiq_mmal_port_parameter_set(dev->instance, control,

					    MMAL_PARAMETER_COLOUR_EFFECT,

					&dev->colourfx, sizeof(dev->colourfx));

					    &dev->colourfx,

					    sizeof(dev->colourfx));



	v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

		 "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
@@ -882,8 +879,7 @@ static int ctrl_set_scene_mode(struct bm2835_mmal_dev *dev, 
						    MMAL_PARAMETER_SHUTTER_SPEED,

						    &shutter_speed,

						    sizeof(shutter_speed));

		ret += vchiq_mmal_port_parameter_set(dev->instance,

					control,

		ret += vchiq_mmal_port_parameter_set(dev->instance, control,

						     MMAL_PARAMETER_EXPOSURE_MODE,

						     &exposure_mode,

						     sizeof(u32));
@@ -935,8 +931,6 @@ static const struct v4l2_ctrl_ops bm2835_mmal_ctrl_ops = { 
	.s_ctrl = bm2835_mmal_s_ctrl,

};







static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {

	{

		V4L2_CID_SATURATION, MMAL_CONTROL_TYPE_STD,
@@ -1228,8 +1222,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev) 
		 fps_range.fps_low.num,

		 fps_range.fps_low.den,

		 fps_range.fps_high.num,

			 fps_range.fps_high.den

		 );

		 fps_range.fps_high.den);



	ret = vchiq_mmal_port_parameter_set(dev->instance,

					    &dev->component[MMAL_COMPONENT_CAMERA]->
@@ -1248,11 +1241,9 @@ int set_framerate_params(struct bm2835_mmal_dev *dev) 
					     &fps_range, sizeof(fps_range));

	if (ret)

		v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,

		 "Failed to set fps ret %d\n",

		 ret);

			 "Failed to set fps ret %d\n", ret);



	return ret;



}



int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
@@ -1338,7 +1329,6 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, 
		case MMAL_CONTROL_TYPE_INT_MENU:

			break;

		}



	}



	return 0;

drivers/staging/media/platform/bcm2835/mmal-vchiq.c

+5 −8
Original line number Diff line number Diff line
@@ -637,7 +637,6 @@ static void service_callback(void *param, 


		/* handling is different for buffer messages */

		switch (msg->h.type) {



		case MMAL_MSG_TYPE_BUFFER_FROM_HOST:

			vchi_held_msg_release(&msg_handle);

			break;
@@ -807,7 +806,6 @@ static void dump_port_info(struct vchiq_mmal_port *port) 


static void port_to_mmal_msg(struct vchiq_mmal_port *port, struct mmal_port *p)

{



	/* todo do readonly fields need setting at all? */

	p->type = port->type;

	p->index = port->index;
@@ -883,7 +881,6 @@ static int port_info_set(struct vchiq_mmal_instance *instance, 
	vchi_held_msg_release(&rmsg_handle);



	return ret;



}



/* use port info get message to retrive port information */
@@ -1358,12 +1355,12 @@ static int port_disable(struct vchiq_mmal_instance *instance, 
	ret = port_action_port(instance, port,

			       MMAL_MSG_PORT_ACTION_TYPE_DISABLE);

	if (ret == 0) {



		/* drain all queued buffers on port */

		spin_lock_irqsave(&port->slock, flags);



		list_for_each_safe(buf_head, q, &port->buffers) {

			struct mmal_buffer *mmalbuf;



			mmalbuf = list_entry(buf_head, struct mmal_buffer,

					     list);

			list_del(buf_head);
@@ -1415,6 +1412,7 @@ static int port_enable(struct vchiq_mmal_instance *instance, 
		hdr_count = 1;

		list_for_each(buf_head, &port->buffers) {

			struct mmal_buffer *mmalbuf;



			mmalbuf = list_entry(buf_head, struct mmal_buffer,

					     list);

			ret = buffer_from_host(instance, port, mmalbuf);
@@ -1456,7 +1454,6 @@ int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance, 
	mutex_unlock(&instance->vchiq_mutex);



	return ret;



}



int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,