[PATCH -next] drm/omap: remove set but not used variable 'frame

public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH -next] drm/omap: remove set but not used variable 'frame_height'
@ 2018-09-11 11:51 YueHaibing
  2018-09-11 21:29 ` Laurent Pinchart
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: YueHaibing @ 2018-09-11 11:51 UTC (permalink / raw)
  To: Tomi Valkeinen, David Airlie, Andrew F. Davis, Laurent Pinchart,
	Sebastian Reichel, Benoit Parrot, Peter Ujfalusi
  Cc: YueHaibing, dri-devel, linux-kernel, kernel-janitors

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/omapdrm/dss/dispc.c: In function 'dispc_ovl_setup_common':
drivers/gpu/drm/omapdrm/dss/dispc.c:2627:19: warning:
 variable 'frame_height' set but not used [-Wunused-but-set-variable]

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/gpu/drm/omapdrm/dss/dispc.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index e61a959..7c23f23 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2624,7 +2624,7 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
 	unsigned int offset0, offset1;
 	s32 row_inc;
 	s32 pix_inc;
-	u16 frame_width, frame_height;
+	u16 frame_width;
 	unsigned int field_offset = 0;
 	u16 in_height = height;
 	u16 in_width = width;
@@ -2714,13 +2714,10 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
 	row_inc = 0;
 	pix_inc = 0;
 
-	if (plane = OMAP_DSS_WB) {
+	if (plane = OMAP_DSS_WB)
 		frame_width = out_width;
-		frame_height = out_height;
-	} else {
+	else
 		frame_width = in_width;
-		frame_height = height;
-	}
 
 	calc_offset(screen_width, frame_width,
 			fourcc, fieldmode, field_offset,

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] drm/omap: remove set but not used variable 'frame_height'
  2018-09-11 11:51 [PATCH -next] drm/omap: remove set but not used variable 'frame_height' YueHaibing
@ 2018-09-11 21:29 ` Laurent Pinchart
  2018-09-26  9:10 ` Tomi Valkeinen
  2018-10-05  7:18 ` [PATCH -next] drm/omap: remove set but not used variable 'plane' YueHaibing
  2 siblings, 0 replies; 4+ messages in thread
From: Laurent Pinchart @ 2018-09-11 21:29 UTC (permalink / raw)
  To: YueHaibing
  Cc: Peter Ujfalusi, David Airlie, linux-kernel, kernel-janitors,
	Sebastian Reichel, dri-devel, Andrew F. Davis, Tomi Valkeinen

Hi YueHaibing,

Thank you for the patch.

On Tuesday, 11 September 2018 15:00:53 EEST YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/gpu/drm/omapdrm/dss/dispc.c: In function 'dispc_ovl_setup_common':
> drivers/gpu/drm/omapdrm/dss/dispc.c:2627:19: warning:
>  variable 'frame_height' set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

I expect Tomi to pick this patch up, but I've also applied it to my tree to 
make sure it won't get lost.

> ---
>  drivers/gpu/drm/omapdrm/dss/dispc.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c
> b/drivers/gpu/drm/omapdrm/dss/dispc.c index e61a959..7c23f23 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dispc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
> @@ -2624,7 +2624,7 @@ static int dispc_ovl_setup_common(struct dispc_device
> *dispc, unsigned int offset0, offset1;
>  	s32 row_inc;
>  	s32 pix_inc;
> -	u16 frame_width, frame_height;
> +	u16 frame_width;
>  	unsigned int field_offset = 0;
>  	u16 in_height = height;
>  	u16 in_width = width;
> @@ -2714,13 +2714,10 @@ static int dispc_ovl_setup_common(struct
> dispc_device *dispc, row_inc = 0;
>  	pix_inc = 0;
> 
> -	if (plane = OMAP_DSS_WB) {
> +	if (plane = OMAP_DSS_WB)
>  		frame_width = out_width;
> -		frame_height = out_height;
> -	} else {
> +	else
>  		frame_width = in_width;
> -		frame_height = height;
> -	}
> 
>  	calc_offset(screen_width, frame_width,
>  			fourcc, fieldmode, field_offset,

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] drm/omap: remove set but not used variable 'frame_height'
  2018-09-11 11:51 [PATCH -next] drm/omap: remove set but not used variable 'frame_height' YueHaibing
  2018-09-11 21:29 ` Laurent Pinchart
@ 2018-09-26  9:10 ` Tomi Valkeinen
  2018-10-05  7:18 ` [PATCH -next] drm/omap: remove set but not used variable 'plane' YueHaibing
  2 siblings, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2018-09-26  9:10 UTC (permalink / raw)
  To: YueHaibing, David Airlie, Andrew F. Davis, Laurent Pinchart,
	Sebastian Reichel, Benoit Parrot, Peter Ujfalusi
  Cc: dri-devel, linux-kernel, kernel-janitors

On 11/09/18 15:00, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/gpu/drm/omapdrm/dss/dispc.c: In function 'dispc_ovl_setup_common':
> drivers/gpu/drm/omapdrm/dss/dispc.c:2627:19: warning:
>  variable 'frame_height' set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/gpu/drm/omapdrm/dss/dispc.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
> index e61a959..7c23f23 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dispc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
> @@ -2624,7 +2624,7 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
>  	unsigned int offset0, offset1;
>  	s32 row_inc;
>  	s32 pix_inc;
> -	u16 frame_width, frame_height;
> +	u16 frame_width;
>  	unsigned int field_offset = 0;
>  	u16 in_height = height;
>  	u16 in_width = width;
> @@ -2714,13 +2714,10 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
>  	row_inc = 0;
>  	pix_inc = 0;
>  
> -	if (plane = OMAP_DSS_WB) {
> +	if (plane = OMAP_DSS_WB)
>  		frame_width = out_width;
> -		frame_height = out_height;
> -	} else {
> +	else
>  		frame_width = in_width;
> -		frame_height = height;
> -	}
>  
>  	calc_offset(screen_width, frame_width,
>  			fourcc, fieldmode, field_offset,
> 
> 
> 

Thanks, applied.

 Tomi

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH -next] drm/omap: remove set but not used variable 'plane'
  2018-09-11 11:51 [PATCH -next] drm/omap: remove set but not used variable 'frame_height' YueHaibing
  2018-09-11 21:29 ` Laurent Pinchart
  2018-09-26  9:10 ` Tomi Valkeinen
@ 2018-10-05  7:18 ` YueHaibing
  2 siblings, 0 replies; 4+ messages in thread
From: YueHaibing @ 2018-10-05  7:18 UTC (permalink / raw)
  To: Tomi Valkeinen, David Airlie
  Cc: YueHaibing, dri-devel, linux-kernel, kernel-janitors

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/omapdrm/omap_fb.c: In function 'omap_framebuffer_update_scanout':
drivers/gpu/drm/omapdrm/omap_fb.c:130:16: warning:
 variable 'plane' set but not used [-Wunused-but-set-variable]
  struct plane *plane = &omap_fb->planes[0];
  
After commit 2ecceeb53b19 ("drm/omap: Move buffer pitch/offset to drm_framebuffer")
'plane' is not used any more.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/gpu/drm/omapdrm/omap_fb.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 4d264fd..e3e47aa 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -127,7 +127,6 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
 {
 	struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
 	const struct drm_format_info *format = omap_fb->format;
-	struct plane *plane = &omap_fb->planes[0];
 	u32 x, y, orient = 0;
 
 	info->fourcc = fb->format->format;
@@ -201,8 +200,6 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
 	info->screen_width /= format->cpp[0];
 
 	if (fb->format->format = DRM_FORMAT_NV12) {
-		plane = &omap_fb->planes[1];
-
 		if (info->rotation_type = OMAP_DSS_ROT_TILER) {
 			WARN_ON(!(omap_gem_flags(fb->obj[1]) & OMAP_BO_TILED));
 			omap_gem_rotated_dma_addr(fb->obj[1], orient, x/2, y/2,

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-10-05  7:18 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-11 11:51 [PATCH -next] drm/omap: remove set but not used variable 'frame_height' YueHaibing
2018-09-11 21:29 ` Laurent Pinchart
2018-09-26  9:10 ` Tomi Valkeinen
2018-10-05  7:18 ` [PATCH -next] drm/omap: remove set but not used variable 'plane' YueHaibing

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox