staging: bcm2835-camera: Drop PREVIEW_LAYER

This define is used only once. So drop the define and init the layer
directly.

Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1585485901-10172-2-git-send-email-stefan.wahren@i2se.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 597acef35d0bc7f89875f12a5d6bb476d5930b86..ff2ba2387e5c3064031fd8eeb760b9f6e5d86bdd 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -668,7 +668,7 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev,
                        MMAL_DISPLAY_SET_ALPHA |
                        MMAL_DISPLAY_SET_DEST_RECT |
                        MMAL_DISPLAY_SET_FULLSCREEN,
-               .layer = PREVIEW_LAYER,
+               .layer = 2,
                .alpha = dev->overlay.global_alpha,
                .fullscreen = 0,
                .dest_rect = {

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
index b5fce38de038c97d715f5d01db040ebed8fe385f..c426a5c0b574b8b74a0fccede484a0b14348c561 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
@@ -30,8 +30,6 @@ enum {
        CAM_PORT_COUNT
 };
 
-#define PREVIEW_LAYER      2
-
 extern int bcm2835_v4l2_debug;
 
 struct bm2835_mmal_dev {