Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Gaston Gonzalez <gascoar@gmail.com>
Link: https://lore.kernel.org/r/d3b6f67421c75829105f793cfb9ec1414b926bf6.1641414449.git.gascoar@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Gaston Gonzalez and committed by
Greg Kroah-Hartman
d6776424 710ec044

+10 -14
+4 -5
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
··· 1735 1735 &enable, 1736 1736 sizeof(enable)); 1737 1737 } 1738 - ret = bm2835_mmal_set_all_camera_controls(dev); 1738 + ret = bcm2835_mmal_set_all_camera_controls(dev); 1739 1739 if (ret < 0) { 1740 1740 v4l2_err(&dev->v4l2_dev, "%s: failed to set all camera controls: %d\n", 1741 1741 __func__, ret); ··· 1769 1769 return ret; 1770 1770 } 1771 1771 1772 - static int bm2835_mmal_init_device(struct bcm2835_mmal_dev *dev, 1773 - struct video_device *vfd) 1772 + static int bcm2835_mmal_init_device(struct bcm2835_mmal_dev *dev, struct video_device *vfd) 1774 1773 { 1775 1774 int ret; 1776 1775 ··· 1907 1908 } 1908 1909 1909 1910 /* setup v4l controls */ 1910 - ret = bm2835_mmal_init_controls(dev, &dev->ctrl_handler); 1911 + ret = bcm2835_mmal_init_controls(dev, &dev->ctrl_handler); 1911 1912 if (ret < 0) { 1912 1913 v4l2_err(&dev->v4l2_dev, "%s: could not init controls: %d\n", 1913 1914 __func__, ret); ··· 1939 1940 goto unreg_dev; 1940 1941 1941 1942 /* initialise video devices */ 1942 - ret = bm2835_mmal_init_device(dev, &dev->vdev); 1943 + ret = bcm2835_mmal_init_device(dev, &dev->vdev); 1943 1944 if (ret < 0) { 1944 1945 v4l2_err(&dev->v4l2_dev, "%s: could not init device: %d\n", 1945 1946 __func__, ret);
+2 -4
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
··· 110 110 unsigned int rgb_bgr_swapped; 111 111 }; 112 112 113 - int bm2835_mmal_init_controls( 114 - struct bcm2835_mmal_dev *dev, 115 - struct v4l2_ctrl_handler *hdl); 113 + int bcm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev, struct v4l2_ctrl_handler *hdl); 116 114 117 - int bm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev); 115 + int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev); 118 116 int set_framerate_params(struct bcm2835_mmal_dev *dev); 119 117 120 118 /* Debug helpers */
+4 -5
drivers/staging/vc04_services/bcm2835-camera/controls.c
··· 884 884 return 0; 885 885 } 886 886 887 - static int bm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl) 887 + static int bcm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl) 888 888 { 889 889 struct bcm2835_mmal_dev *dev = container_of(ctrl->handler, struct bcm2835_mmal_dev, 890 890 ctrl_handler); ··· 904 904 } 905 905 906 906 static const struct v4l2_ctrl_ops bm2835_mmal_ctrl_ops = { 907 - .s_ctrl = bm2835_mmal_s_ctrl, 907 + .s_ctrl = bcm2835_mmal_s_ctrl, 908 908 }; 909 909 910 910 static const struct bcm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { ··· 1246 1246 }, 1247 1247 }; 1248 1248 1249 - int bm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev) 1249 + int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev) 1250 1250 { 1251 1251 int c; 1252 1252 int ret = 0; ··· 1311 1311 return ret; 1312 1312 } 1313 1313 1314 - int bm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev, 1315 - struct v4l2_ctrl_handler *hdl) 1314 + int bcm2835_mmal_init_controls(struct bcm2835_mmal_dev *dev, struct v4l2_ctrl_handler *hdl) 1316 1315 { 1317 1316 int c; 1318 1317 const struct bcm2835_mmal_v4l2_ctrl *ctrl;