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

staging: vc04_services: rename variables 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 all variables 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/a0af5deacebc2da9b21772c7677e1a9627edbed6.1641414449.git.gascoar@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Gaston Gonzalez and committed by
Greg Kroah-Hartman
eccbcf75 d6776424

+14 -21
+2 -2
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
··· 654 654 v4l2_err(&dev->v4l2_dev, "Failed to disable camera\n"); 655 655 } 656 656 657 - static const struct vb2_ops bm2835_mmal_video_qops = { 657 + static const struct vb2_ops bcm2835_mmal_video_qops = { 658 658 .queue_setup = queue_setup, 659 659 .buf_init = buffer_init, 660 660 .buf_prepare = buffer_prepare, ··· 1930 1930 q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ; 1931 1931 q->drv_priv = dev; 1932 1932 q->buf_struct_size = sizeof(struct vb2_mmal_buffer); 1933 - q->ops = &bm2835_mmal_video_qops; 1933 + q->ops = &bcm2835_mmal_video_qops; 1934 1934 q->mem_ops = &vb2_vmalloc_memops; 1935 1935 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; 1936 1936 q->lock = &dev->mutex;
+12 -19
drivers/staging/vc04_services/bcm2835-camera/controls.c
··· 58 58 0, 100, 200, 400, 800, 59 59 }; 60 60 61 - enum bm2835_mmal_ctrl_type { 61 + enum bcm2835_mmal_ctrl_type { 62 62 MMAL_CONTROL_TYPE_STD, 63 63 MMAL_CONTROL_TYPE_STD_MENU, 64 64 MMAL_CONTROL_TYPE_INT_MENU, ··· 67 67 68 68 struct bcm2835_mmal_v4l2_ctrl { 69 69 u32 id; /* v4l2 control identifier */ 70 - enum bm2835_mmal_ctrl_type type; 70 + enum bcm2835_mmal_ctrl_type type; 71 71 /* control minimum value or 72 72 * mask for MMAL_CONTROL_TYPE_STD_MENU 73 73 */ ··· 903 903 return ret; 904 904 } 905 905 906 - static const struct v4l2_ctrl_ops bm2835_mmal_ctrl_ops = { 906 + static const struct v4l2_ctrl_ops bcm2835_mmal_ctrl_ops = { 907 907 .s_ctrl = bcm2835_mmal_s_ctrl, 908 908 }; 909 909 ··· 1323 1323 1324 1324 switch (ctrl->type) { 1325 1325 case MMAL_CONTROL_TYPE_STD: 1326 - dev->ctrls[c] = 1327 - v4l2_ctrl_new_std(hdl, 1328 - &bm2835_mmal_ctrl_ops, 1329 - ctrl->id, ctrl->min, 1330 - ctrl->max, ctrl->step, 1331 - ctrl->def); 1326 + dev->ctrls[c] = v4l2_ctrl_new_std(hdl, &bcm2835_mmal_ctrl_ops, 1327 + ctrl->id, ctrl->min, ctrl->max, 1328 + ctrl->step, ctrl->def); 1332 1329 break; 1333 1330 1334 1331 case MMAL_CONTROL_TYPE_STD_MENU: ··· 1349 1352 mask = ~mask; 1350 1353 } 1351 1354 1352 - dev->ctrls[c] = 1353 - v4l2_ctrl_new_std_menu(hdl, 1354 - &bm2835_mmal_ctrl_ops, 1355 - ctrl->id, ctrl->max, 1356 - mask, ctrl->def); 1355 + dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl, &bcm2835_mmal_ctrl_ops, 1356 + ctrl->id, ctrl->max, mask, 1357 + ctrl->def); 1357 1358 break; 1358 1359 } 1359 1360 1360 1361 case MMAL_CONTROL_TYPE_INT_MENU: 1361 - dev->ctrls[c] = 1362 - v4l2_ctrl_new_int_menu(hdl, 1363 - &bm2835_mmal_ctrl_ops, 1364 - ctrl->id, ctrl->max, 1365 - ctrl->def, ctrl->imenu); 1362 + dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl, &bcm2835_mmal_ctrl_ops, 1363 + ctrl->id, ctrl->max, 1364 + ctrl->def, ctrl->imenu); 1366 1365 break; 1367 1366 1368 1367 case MMAL_CONTROL_TYPE_CLUSTER: