staging: vc04_services: rename string literal 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 the string term 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/91caae07fce0e4511f283388304e935526ba29ed.1641414449.git.gascoar@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index cbc881e19f65ebfdb1c4f058b62fe409133e749b..aaf529f2186c0c8eb87029275e39cfa732083566 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -884,12 +884,10 @@ static int vidioc_querycap(struct file *file, void *priv,
 
        vchiq_mmal_version(dev->instance, &major, &minor);
 
-       strscpy(cap->driver, "bm2835 mmal", sizeof(cap->driver));
-       snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d",
-                major, minor);
+       strscpy(cap->driver, "bcm2835 mmal", sizeof(cap->driver));
+       snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d", major, minor);
 
-       snprintf((char *)cap->bus_info, sizeof(cap->bus_info),
-                "platform:%s", dev->v4l2_dev.name);
+       snprintf((char *)cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev->v4l2_dev.name);
        return 0;
 }