mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/2] drm: Resolve many missing-field-initializers warnings
@ 2014-08-29 15:21 Jeff Kirsher
  2014-08-29 15:21 ` [PATCH 2/2] drm: Resolve shadow warning for s32 Jeff Kirsher
  0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2014-08-29 15:21 UTC (permalink / raw)
  To: airlied; +Cc: Mark Rustad, dri-devel, linux-kernel, Jeff Kirsher

From: Mark Rustad <mark.d.rustad@intel.com>

Resolve many missing-field-initializers warnings that appear
in W=2 builds by changing nested object initialization syntax.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 include/drm/drm_modes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 91d0582..0a118f3 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -86,7 +86,7 @@ enum drm_mode_status {
 	.htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
 	.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
 	.vscan = (vs), .flags = (f), \
-	.base.type = DRM_MODE_OBJECT_MODE
+	.base = { .type = DRM_MODE_OBJECT_MODE }
 
 #define CRTC_INTERLACE_HALVE_V	(1 << 0) /* halve V values for interlacing */
 #define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */
-- 
1.9.3


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

* [PATCH 2/2] drm: Resolve shadow warning for s32
  2014-08-29 15:21 [PATCH 1/2] drm: Resolve many missing-field-initializers warnings Jeff Kirsher
@ 2014-08-29 15:21 ` Jeff Kirsher
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Kirsher @ 2014-08-29 15:21 UTC (permalink / raw)
  To: airlied; +Cc: Mark Rustad, dri-devel, linux-kernel, Jeff Kirsher

From: Mark Rustad <mark.d.rustad@intel.com>

Resolve a shadow warning produced in a W=2 build by changing
the name of a local variable from s32 to ds32. Since s32 clashes
with the well-known typedef, any macro expansion that could
someday be used that might attempt to use an s32 type would fail
to compile. It is best to eliminate the hazard.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/gpu/drm/drm_ioc32.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 2f4c4343..777ffd8 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -339,7 +339,7 @@ typedef struct drm_stats32 {
 static int compat_drm_getstats(struct file *file, unsigned int cmd,
 			       unsigned long arg)
 {
-	drm_stats32_t s32;
+	drm_stats32_t ds32;
 	drm_stats32_t __user *argp = (void __user *)arg;
 	struct drm_stats __user *stats;
 	int i, err;
@@ -352,14 +352,14 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd,
 	if (err)
 		return err;
 
-	if (__get_user(s32.count, &stats->count))
+	if (__get_user(ds32.count, &stats->count))
 		return -EFAULT;
 	for (i = 0; i < 15; ++i)
-		if (__get_user(s32.data[i].value, &stats->data[i].value)
-		    || __get_user(s32.data[i].type, &stats->data[i].type))
+		if (__get_user(ds32.data[i].value, &stats->data[i].value)
+		    || __get_user(ds32.data[i].type, &stats->data[i].type))
 			return -EFAULT;
 
-	if (copy_to_user(argp, &s32, sizeof(s32)))
+	if (copy_to_user(argp, &ds32, sizeof(ds32)))
 		return -EFAULT;
 	return 0;
 }
-- 
1.9.3


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

end of thread, other threads:[~2014-08-29 15:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-29 15:21 [PATCH 1/2] drm: Resolve many missing-field-initializers warnings Jeff Kirsher
2014-08-29 15:21 ` [PATCH 2/2] drm: Resolve shadow warning for s32 Jeff Kirsher

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

all inboxes | Powered by JetHome®