diff options
| author |   Stefan Wahren <stefan.wahren@i2se.com> | 2020-03-29 14:44:53 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-13 08:55:30 +0200 |
| commit | e7a57270e53dedcf860c266a0829c7b1a1943a45 (patch) | |
| tree | ad356c6fe6ea3aed4c42d04f5e4ce46e92456e75 | |
| parent | staging: fsl-dpaa2: ethsw: Fix parenthesis alignment (diff) | |
| download | linux-dev-e7a57270e53dedcf860c266a0829c7b1a1943a45.tar.xz linux-dev-e7a57270e53dedcf860c266a0829c7b1a1943a45.zip | |
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>
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 597acef35d0b..ff2ba2387e5c 100644 --- 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 b5fce38de038..c426a5c0b574 100644 --- 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 { |