mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: airlied@linux.ie
Cc: Mark Rustad <mark.d.rustad@intel.com>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [PATCH 2/2] drm: Resolve shadow warning for s32
Date: Fri, 29 Aug 2014 08:21:26 -0700	[thread overview]
Message-ID: <1409325686-13994-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1409325686-13994-1-git-send-email-jeffrey.t.kirsher@intel.com>

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


      reply	other threads:[~2014-08-29 15:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-29 15:21 [PATCH 1/2] drm: Resolve many missing-field-initializers warnings Jeff Kirsher
2014-08-29 15:21 ` Jeff Kirsher [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409325686-13994-2-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.d.rustad@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®