Commit d6776424 authored by Gaston Gonzalez's avatar Gaston Gonzalez Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: rename functions containing bm2835_* to bcm2835_* 



In the kernel, all names related to the chip BCM2835 are always named
bcm2835_*. To avoid confusion, and to make things more consistent,
rename functions using bm2835_* to bcm2835_*.

While at it, some realignments were made to improve readability.

Suggested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGaston Gonzalez <gascoar@gmail.com>
Link: https://lore.kernel.org/r/d3b6f67421c75829105f793cfb9ec1414b926bf6.1641414449.git.gascoar@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 710ec044

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

+4 −5
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ static int mmal_init(struct bcm2835_mmal_dev *dev) 
					      &enable,

					      sizeof(enable));

	}

	ret = bm2835_mmal_set_all_camera_controls(dev);

	ret = bcm2835_mmal_set_all_camera_controls(dev);

	if (ret < 0) {

		v4l2_err(&dev->v4l2_dev, "%s: failed to set all camera controls: %d\n",

			 __func__, ret);
@@ -1769,8 +1769,7 @@ static int mmal_init(struct bcm2835_mmal_dev *dev) 
	return ret;

}



static int bm2835_mmal_init_device(struct bcm2835_mmal_dev *dev,

				   struct video_device *vfd)

static int bcm2835_mmal_init_device(struct bcm2835_mmal_dev *dev, struct video_device *vfd)

{

	int ret;
@@ -1908,7 +1907,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) 
		}



		/* setup v4l controls */

		ret = bm2835_mmal_init_controls(dev, &dev->ctrl_handler);

		ret = bcm2835_mmal_init_controls(dev, &dev->ctrl_handler);

		if (ret < 0) {

			v4l2_err(&dev->v4l2_dev, "%s: could not init controls: %d\n",

				 __func__, ret);
@@ -1940,7 +1939,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) 
			goto unreg_dev;



		/* initialise video devices */

		ret = bm2835_mmal_init_device(dev, &dev->vdev);

		ret = bcm2835_mmal_init_device(dev, &dev->vdev);

		if (ret < 0) {

			v4l2_err(&dev->v4l2_dev, "%s: could not init device: %d\n",

				 __func__, ret);

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

+2 −4
Original line number Diff line number Diff line
@@ -110,11 +110,9 @@ struct bcm2835_mmal_dev { 
	unsigned int rgb_bgr_swapped;

};



int bm2835_mmal_init_controls(

			struct bcm2835_mmal_dev *dev,

			struct v4l2_ctrl_handler *hdl);

int bcm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev, struct v4l2_ctrl_handler *hdl);



int bm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev);

int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev);

int set_framerate_params(struct bcm2835_mmal_dev *dev);



/* Debug helpers */

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

+4 −5
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static int ctrl_set_scene_mode(struct bcm2835_mmal_dev *dev, 
	return 0;

}



static int bm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl)

static int bcm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl)

{

	struct bcm2835_mmal_dev *dev = container_of(ctrl->handler, struct bcm2835_mmal_dev,

						    ctrl_handler);
@@ -904,7 +904,7 @@ static int bm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl) 
}



static const struct v4l2_ctrl_ops bm2835_mmal_ctrl_ops = {

	.s_ctrl = bm2835_mmal_s_ctrl,

	.s_ctrl = bcm2835_mmal_s_ctrl,

};



static const struct bcm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
@@ -1246,7 +1246,7 @@ static const struct bcm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	},

};



int bm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev)

int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev)

{

	int c;

	int ret = 0;
@@ -1311,8 +1311,7 @@ int set_framerate_params(struct bcm2835_mmal_dev *dev) 
	return ret;

}



int bm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev,

			      struct v4l2_ctrl_handler *hdl)

int bcm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev, struct v4l2_ctrl_handler *hdl)

{

	int c;

	const struct bcm2835_mmal_v4l2_ctrl *ctrl;