From: Mao Wenan <maowenan@huawei.com>
To: <airlied@linux.ie>, <daniel@ffwll.ch>,
<alexander.deucher@amd.com>, <christian.koenig@amd.com>,
<David1.Zhou@amd.com>, <dan.carpenter@oracle.com>,
<julia.lawall@lip6.fr>
Cc: <kernel-janitors@vger.kernel.org>,
<amd-gfx@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
Mao Wenan <maowenan@huawei.com>
Subject: [PATCH -next v2] drm/amdgpu: return 'ret' in amdgpu_pmu_init
Date: Sat, 22 Jun 2019 21:05:27 +0800 [thread overview]
Message-ID: <20190622130527.182022-1-maowenan@huawei.com> (raw)
In-Reply-To: <20190622104318.GT28859@kadam>
There is one warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c: In function ‘amdgpu_pmu_init’:
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:249:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
int ret = 0;
^
amdgpu_pmu_init() is called by amdgpu_device_init() in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c,
which will use the return value. So it returns 'ret' for caller.
amdgpu_device_init()
r = amdgpu_pmu_init(adev);
Fixes: 9c7c85f7ea1f ("drm/amdgpu: add pmu counters")
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
v1->v2: change the subject for this patch; change the indenting when it calls init_pmu_by_type; use the value 'ret' in
amdgpu_pmu_init().
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 0e6dba9..145e720 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -252,8 +252,8 @@ int amdgpu_pmu_init(struct amdgpu_device *adev)
case CHIP_VEGA20:
/* init df */
ret = init_pmu_by_type(adev, df_v3_6_attr_groups,
- "DF", "amdgpu_df", PERF_TYPE_AMDGPU_DF,
- DF_V3_6_MAX_COUNTERS);
+ "DF", "amdgpu_df", PERF_TYPE_AMDGPU_DF,
+ DF_V3_6_MAX_COUNTERS);
/* other pmu types go here*/
break;
@@ -261,7 +261,7 @@ int amdgpu_pmu_init(struct amdgpu_device *adev)
return 0;
}
- return 0;
+ return ret;
}
--
2.7.4
next prev parent reply other threads:[~2019-06-22 12:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-22 3:03 [PATCH -next] drm/amdgpu: remove set but not used variables 'ret' Mao Wenan
2019-06-22 6:02 ` Julia Lawall
2019-06-22 7:20 ` maowenan
2019-06-22 10:43 ` Dan Carpenter
2019-06-22 13:05 ` Mao Wenan [this message]
2019-06-22 13:06 ` [PATCH -next v2] drm/amdgpu: return 'ret' in amdgpu_pmu_init Julia Lawall
2019-06-22 13:56 ` maowenan
2019-06-22 14:00 ` Julia Lawall
2019-06-24 3:16 ` maowenan
2019-06-22 18:13 ` Joe Perches
2019-06-24 3:41 ` maowenan
2019-06-24 3:46 ` Joe Perches
2019-06-23 6:00 ` [PATCH -next] drm/amdgpu: remove set but not used variables 'ret' Dan Carpenter
2019-06-23 6:10 ` Julia Lawall
2019-06-24 3:45 ` [PATCH -next v3] drm/amdgpu: return 'ret' immediately if failed in amdgpu_pmu_init Mao Wenan
2019-06-24 8:39 ` Dan Carpenter
2019-06-24 9:29 ` maowenan
2019-06-24 9:48 ` Dan Carpenter
2019-06-24 11:23 ` [PATCH -next v4] " Mao Wenan
2019-06-24 17:42 ` Kim, Jonathan
2019-06-26 11:35 ` maowenan
2019-07-10 7:31 ` maowenan
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=20190622130527.182022-1-maowenan@huawei.com \
--to=maowenan@huawei.com \
--cc=David1.Zhou@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dan.carpenter@oracle.com \
--cc=daniel@ffwll.ch \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).