From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933072AbcIGHRG (ORCPT ); Wed, 7 Sep 2016 03:17:06 -0400 Received: from mail-cys01nam02on0084.outbound.protection.outlook.com ([104.47.37.84]:31633 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756277AbcIGHQw (ORCPT ); Wed, 7 Sep 2016 03:16:52 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Christian.Koenig@amd.com; Subject: Re: [PATCH] drm: squash lines for simple wrapper functions To: Masahiro Yamada , David Airlie , "dri-devel@lists.freedesktop.org" References: <1473203062-21731-1-git-send-email-yamada.masahiro@socionext.com> CC: Gustavo Padovan , Yakir Yang , "Huang, Ray" , "Deucher, Alexander" , "Liu, Monk" , "Zhou, David(ChunMing)" , Daniel Vetter , Heiko Stuebner , "Huang, JinHuiEric" , "Cui, Flora" , Inki Dae , Krzysztof Kozlowski , Dave Airlie , Jani Nikula , "intel-gfx@lists.freedesktop.org" , Frediano Ziglio , "Li, Samuel" , Tomasz Figa , "Sumit Semwal" , "linux-kernel@vger.kernel.org" , "StDenis, Tom" , "Dan Carpenter" From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: Date: Wed, 7 Sep 2016 09:16:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1473203062-21731-1-git-send-email-yamada.masahiro@socionext.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [2a02:908:1251:7981:cdef:727e:e4d4:7ce3] X-ClientProxiedBy: AM4PR02CA0008.eurprd02.prod.outlook.com (10.165.239.146) To DM5PR12MB1305.namprd12.prod.outlook.com (10.168.237.148) X-MS-Office365-Filtering-Correlation-Id: 46235fa9-6e5b-4d0f-9b3c-08d3d6eeeeb6 X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1305;2:6RxHnuF+BwuE/dE7MXbrliOuSuh2oPMwyL5OlUoD7cRYdco4WAUNpD3KEeLISj1IZGwfMx+HOhWXb+ZTwJGRR1oQpjpU6uPeXti7IOAa1zLWrxhnZ8GWZ+DuoPnXqRVkWGx0pj+ZU/AOvQCEq8CDQEAFhf8vS3K8X2Ordp962C2wTBsT+3OF/1QcyjJ1UnqL;3:Kkfyv5rbTvDiWYPG4d/qVm1arwudMm8Wqmg9I1zpKCg44gtQZUepFOjrgxGZdxErBtLLF/YZnjjcyXTd4VsH8/i9Jqr+aY5ZfcoUtfr9yXNntHEJOaJrJ0DtbD8gzyp7;25:yI3A8Ek4/j3iBFQcJKgCvllJbpkPXdYtCDkawESPoFOf03OYLUiDw/El+0ANdfoSaNh0oFNbw2W+UTYW4gp6/PRNFuT3oPpKpxcHAa/HiLPVBNEWh+U6HsKVNOcXbOIMqq7nbBXS2dRMuqrbFFSiyBzzb+GTiGJO/PG+Mf684IXTB+zDs1bn+mjhzwtnEud8H4RgVCrKrIEepyEDMAJ+/mwj9bIHvrAU26MjEHUtPUBl6ktDLFyd9f7gynhKakwdNGLtF5q/o6gLGgu5TZePWxQkt/yyJHrWOcZNcjpYP97cPMsQV0KTHdtTRV3p6zlHl5S/9ZOlF0MqjhfeFZhx5fng2d+W/+smGTNK/QCl2r7EZ76NBxhE59TOoIM7Y0hUZTtTVHia4IRumfL5YueJgg==;31:eiVsQG2LhN6W8xPQdiddSoNmzBZtMXXTW0/TcxlwbIrnXgA2o4JULslL4KmuSn31czNW2cFC9CvIAYDUe2VWnFtPzWsftS1+Wbwt+T765md6ewofjtgbRxaEnUoeHmrQpsbS5IjtoLl2BXzvHkaB79pRiOm20RD+TsOm/AElHP79HIPZRMb2hd2MNwxn4F+tErFkVyGh9D05QRfnS74V3ZLVzh7lJGMDKCjD9Y/ffNk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1305; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1305;20:FyVHopo7ePOlhiH+wMyq9Roa7zNAesUZlsZPaX+2VLsWBR4QCkcAkKVqsc3EUmSxhLVVv92UMYANh2FrBWQd6ddNFuyf0+qA2xACa4jUFNigoqweVqL4pJtdAHVDwCJ7KvCGhOtxSqUZ5EdvPUm/46oOlGPjwhFZ1U//cL4ZwvU5dHtaMJXpQVXIQMMAG1Dy+5SOEr992xXwOPKlXKaB+KwVjff7Kkl0nfweITZYcLH6+4QPlzPdbFAf3e5sfEsvcf4+yAkBw11L28E9/c75NlMkKUTBs0DuFTEtUdT1XL4xu3eqaAFL9HW89xItukNJlIzi1pTKKDMBnWqjagFbzKGIwOb9qIp8k/1Pa7x7lenjrEmmYQc906jn6vhHenS6aFBkVjR7RCTtetn0rMRZB9uqwSWn5e4wAr1K2boca38+zq3O7yF+WOk9sMCzmXpXfk4WAu9SRq/DWOFW32ULg70GYeBLwHbhZ0j/kbSOBs0sgmFj07+w9mKAwJnR1oZm;4:G5LV5qr3uyXSp0wg0f6gutMsI1uzINDOp6NSFH2CI7nx7ECsePwgFHrRkx++fBeVfXYr7nSns4Gszt25Me6RRJYDN5V2rG7HSCh3jnH6UcQvtTwkWnZexiqJQz1l8jCugh5IeIlfqCJbQtMXLVtyJE9ltzgBXE+wzXuhLYz7rv7qm19qbGyLt6rsVLAKbfxzoWQ4QTXVGrbscJoHY3yY20kfJxYk/kP7FshYcVzZKZtd7seXGtuM9whE9K6Azi4AkVDbXL/LSgpNWmrj1Xy0TZPQabzwR26IEk8cbAhTMqlCoiaoPIpatfkoScJfrtXhfg5IF2FI2OrVj3qmSf3vOHYe6Jit2U5abzYDUNLS97dlcKvkHonsmpnMfaPI1xggQqWEvwsXibbHZfXQ+xDe+A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026);SRVR:DM5PR12MB1305;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1305; X-Forefront-PRVS: 0058ABBBC7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(65806001)(65826007)(97736004)(65956001)(77096005)(54356999)(7416002)(101416001)(81156014)(42186005)(19580395003)(68736007)(47776003)(81166006)(105586002)(7846002)(36756003)(8676002)(6116002)(31686004)(1706002)(23746002)(7736002)(50466002)(19580405001)(4001350100001)(50986999)(86362001)(76176999)(230700001)(83506001)(64126003)(2950100001)(4326007)(2501003)(586003)(33646002)(31696002)(5660300001)(5001770100001)(2906002)(92566002)(305945005)(106356001)(189998001)(21314002)(3826002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1305;H:[IPv6:2a02:908:1251:7981:cdef:727e:e4d4:7ce3];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DM5PR12MB1305;23:xsJ3v0KeyFUrJMlPMtNIjCRzN43y6zvOCnSva?= =?Windows-1252?Q?upVDUyaO8GE9wLP/TFPPfe04J0ecD7ww0Bzzy9RoaA8+ZqXlwaAwKDwl?= =?Windows-1252?Q?i1m0oUelJQRjng6UQ3askCqdUxsC00UoNgtLXp0JFRiA+d24NXWwUq7r?= =?Windows-1252?Q?GYX9gPjpIHvgSbarc9o/RoUrTKjMUEfD5wZZyABffyJhu81iPiGULhBH?= =?Windows-1252?Q?g+aYq1liOko7T8qTtbmxdEiK9kz5/0N54HpaCHctOrvrVMdYVST4B2Ni?= =?Windows-1252?Q?fqPEfdeeAgMJUSta/I/Q1+Xmy6gx+wKWXIXxEIpHRlghbY3YhtCNrPaW?= =?Windows-1252?Q?oLPYk7z9//9Vlu+KXmDqVSUzpdPJHviHnv8Hy6RTu6migT6M95VDm80k?= =?Windows-1252?Q?i7O7CBnxgAAaCyoco4wxOD+BbmVjMHM5C4d6pjXksuD/I0n+o+mp7bR4?= =?Windows-1252?Q?ailz5GfuMgPdIOufTOqfv04DUwCFB1+iMHLiGEeM0KmEDP+2xiq09+Uh?= =?Windows-1252?Q?ptSAFYLsMOhDypEhs4y2JtwOOqzlOdv0Iu6HDxPlABdMPnhLjHqpJioI?= =?Windows-1252?Q?ky6u1jYXYaA2b1+jZoKR+xqltPbYIBRek31SlN6ND8jHYaXhHkT3qdVm?= =?Windows-1252?Q?UpEcpahMS43iz/dUzADh9iwzfY6QEx9U7U4KHHgDmpP5dOcirtbfUQ2+?= =?Windows-1252?Q?ljxVJKknYcRHmGN6xKZ2qGitPMnOcN3mnlK7TACMzOQlTiz4HQo7hyi3?= =?Windows-1252?Q?jLjJoOgP/10wCy7+6bNRa7MVYI1/x6whWl7ZAe3/r1+OWcl5XfMboMhg?= =?Windows-1252?Q?8OCGU4YSKXZ8e/i2A6ZGrR1BptsQmwSCD/yoRggpuIWKgEZZF77VqZSG?= =?Windows-1252?Q?b6F8q6VqA2ef4Jsr8mrd6QGx9/55wIOB/245C3AgfFyMQpCtG0HHXeAI?= =?Windows-1252?Q?1y02MAELfzs/aRYQX6M07vAx2/VWWJiJsbkJPNNDebYWp7aXKEHbg+Jh?= =?Windows-1252?Q?+UX0irGm1TQpZNCsRWDAOiIjvVNfH26ncYee7r2Jo9YfbKIrZwzeut2V?= =?Windows-1252?Q?Jcu1zfWuYsIhmz4yevCcozZEZ7wI++bT6RfsYMS/Uzh43UDHAPOq6ZNE?= =?Windows-1252?Q?6BxgZgDaqC02ca67oMiWNcwmlz5VPmtPXRfoS3g0cZoP5A+m0Q5N9pbX?= =?Windows-1252?Q?X0uyGCk+zcpyJOFOJkjv3KCqaofFewMFZqWyn48iPUIOUtTUsGXfxfpx?= =?Windows-1252?Q?fl5qtbSpImt08boRV6r+Lua8VcnAK6IV7vRQ6OzAdhy5Ks9GkuIHTY5c?= =?Windows-1252?Q?IswLH9moUGaLTe0Mtehr621ieMXgfNffipID/9ycsS1PgvshMQjAOKJB?= =?Windows-1252?Q?/CAH66sCnYZ4kqK50Piohhlyjt6tmY4kw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1305;6:+yRqwJ5+Kqn4FRmARKPo3PafrwNaV2Llsto6fmWSBRqBUOUfAC5qQj+mqpiqIoTjyWouzvBS0xVTdEJuNOB5TCrXAJKDFrL0VWDKwVicqd7sRW7TK8ZbxldQ7Oj9DegxLOC04y5KMfL/nAnEnXF+8T0rXELs2tDQUTbdCetmJsz7Ir4QuVr2OYb7dlUIw+H7/OVsAfmanUc9Dr1O01+Lo86YDpHwKJhtOfKmD3pkMSEqbufYSu+NxQmnFumHw3q3V66m+KYME82Y2xtGXVq4bwJGFaY7wI43TpHTtAD18Z8lApFPe9yDkB/NNSciK5GDy6Ga7W/T6agHJdJtbdFEGA==;5:Ruwv5rGo/nysC81Fkq4v3i6GzOhm04+1aKCv9h07KXcUEpW+DLh4WU+xHhMsBVIOeiw6C6TmeMB9aZq9HgvEBCBEybPDWit9fUDmRuOqqSpgRONv+xTM/H12h6kuf5m6uPsEDnorq1Pq16RKQMulSw==;24:FFMR1TuovGtlqfmyGv8PDFSIHrAX1M5OPJ80eRBNSiIRmejWRdCZ6PkhZ9zK7TDeSsu170yqq5zUmjN2e1jOx06z0MBb8959o4i6T6rRogI=;7:DqhQhm0p7C6g9GTXZcJm//9HcYsu/6FunPXvtNcs+p7Y/pfk3ETCjTBHGcFLCbW5hZiWuJJQET8rPVEeokuYX25zA/ZDJtAB4QkjSwqUT8ct5cnjtrxdSqxG0wc+iNGeBRw2lcbRi1zOi2ZtKZNhQWV3/m9Obhoh2GmiXYmNd+M7YZ4J4w7dqyq/SoCh1DMf7TABmIggeRIH6JloQJiTZmJiGEr0FMZo+DVt63pIXHF2gTCzFI481+V30ODTLbVe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1305;20:6to+Vi9tMWnyvEwVzUvoKZ0x+s8kKUbxXSh2QB83wudqMo5mr7+55zKDVBMQOg5jL9o9TRYygp5g3D1BThaI2PzUWhdquZA2EqAPw8jFn/39q4IXsJRPlb0/7P1bueGkLo7V1zeLcjZ9HDYjSbpYW+YtgSkMPR8cjcIguQmhjPzCvE3TJE+rwBBAbyMnvD1T7+wseDoVlF5+Oa6GEJnbTwiZpx4nPDW+wVJ0Cs/1FSrgTbYv/B9WtPn0/XRBse/E X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2016 07:16:44.8746 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1305 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 07.09.2016 um 01:04 schrieb Masahiro Yamada: > Remove unneeded variables and assignments. > > Signed-off-by: Masahiro Yamada Tom StDenis was working on a similar patch for amdgpu as well, please make sure that your work doesn't conflict with his. Apart from that looks good to me. But I would prefer this to be split up per driver, cause I can't really give my rb on this patch when it touches drivers all over the place. On the other hand feel free to add my Acked-by and merge it as general cleanup through Dave directly. Regards, Christian. > --- > > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +----- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +----- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +----- > drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++---------------- > drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++----- > drivers/gpu/drm/i915/i915_drv.c | 8 +------- > drivers/gpu/drm/qxl/qxl_draw.c | 7 ++----- > drivers/gpu/drm/qxl/qxl_release.c | 7 ++----- > drivers/gpu/drm/radeon/cik.c | 6 +----- > drivers/gpu/drm/radeon/r100.c | 6 +----- > drivers/gpu/drm/radeon/r600.c | 6 +----- > 11 files changed, 17 insertions(+), 68 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > index b818461..0d5307a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c > @@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle, > > static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring) > { > - u32 rptr; > - > - rptr = ring->adev->wb.wb[ring->rptr_offs]; > - > - return rptr; > + return ring->adev->wb.wb[ring->rptr_offs]; > } > > static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring) > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > index a64715d..b165c78 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > @@ -190,12 +190,8 @@ out: > */ > static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring) > { > - u32 rptr; > - > /* XXX check if swapping is necessary on BE */ > - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2; > - > - return rptr; > + return ring->adev->wb.wb[ring->rptr_offs] >> 2; > } > > /** > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > index 653ce5e..cf253b9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > @@ -335,12 +335,8 @@ out: > */ > static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring) > { > - u32 rptr; > - > /* XXX check if swapping is necessary on BE */ > - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2; > - > - return rptr; > + return ring->adev->wb.wb[ring->rptr_offs] >> 2; > } > > /** > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c > index 48030f0..d37d112 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c > @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp, > > u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp) > { > - u32 reg; > - > - reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); > - return reg; > + return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL); > } > > u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp) > { > - u32 reg; > - > - reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); > - return reg; > + return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL); > } > > u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp) > { > - u32 reg; > - > - reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); > - return reg; > + return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL); > } > > u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp) > { > - u32 reg; > - > - reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); > - return reg; > + return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL); > } > > void analogix_dp_reset_macro(struct analogix_dp_device *dp) > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index 04e4571..302bdcb 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr, > static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_sideband_msg_tx *txmsg) > { > - bool ret; > - > /* > * All updates to txmsg->state are protected by mgr->qlock, and the two > * cases we check here are terminal states. For those the barriers > * provided by the wake_up/wait_event pair are enough. > */ > - ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX || > - txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT); > - return ret; > + return txmsg->state == DRM_DP_SIDEBAND_TX_RX || > + txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT; > } > > static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 95ddd56..59d029d 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev) > > static int i915_driver_open(struct drm_device *dev, struct drm_file *file) > { > - int ret; > - > - ret = i915_gem_open(dev, file); > - if (ret) > - return ret; > - > - return 0; > + return i915_gem_open(dev, file); > } > > /** > diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c > index ffe8853..9b728ed 100644 > --- a/drivers/gpu/drm/qxl/qxl_draw.c > +++ b/drivers/gpu/drm/qxl/qxl_draw.c > @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev, > static int > alloc_drawable(struct qxl_device *qdev, struct qxl_release **release) > { > - int ret; > - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable), > - QXL_RELEASE_DRAWABLE, release, > - NULL); > - return ret; > + return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable), > + QXL_RELEASE_DRAWABLE, release, NULL); > } > > static void > diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c > index f599cd0..cd83f05 100644 > --- a/drivers/gpu/drm/qxl/qxl_release.c > +++ b/drivers/gpu/drm/qxl/qxl_release.c > @@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev, > static int qxl_release_bo_alloc(struct qxl_device *qdev, > struct qxl_bo **bo) > { > - int ret; > /* pin releases bo's they are too messy to evict */ > - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true, > - QXL_GEM_DOMAIN_VRAM, NULL, > - bo); > - return ret; > + return qxl_bo_create(qdev, PAGE_SIZE, false, true, > + QXL_GEM_DOMAIN_VRAM, NULL, bo); > } > > int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo) > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index 0c1b9ff..4da1140 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev, > u32 cik_gfx_get_wptr(struct radeon_device *rdev, > struct radeon_ring *ring) > { > - u32 wptr; > - > - wptr = RREG32(CP_RB0_WPTR); > - > - return wptr; > + return RREG32(CP_RB0_WPTR); > } > > void cik_gfx_set_wptr(struct radeon_device *rdev, > diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c > index f25994b..f5e84f4 100644 > --- a/drivers/gpu/drm/radeon/r100.c > +++ b/drivers/gpu/drm/radeon/r100.c > @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev, > u32 r100_gfx_get_wptr(struct radeon_device *rdev, > struct radeon_ring *ring) > { > - u32 wptr; > - > - wptr = RREG32(RADEON_CP_RB_WPTR); > - > - return wptr; > + return RREG32(RADEON_CP_RB_WPTR); > } > > void r100_gfx_set_wptr(struct radeon_device *rdev, > diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c > index 9247e7d..f034687 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev, > u32 r600_gfx_get_wptr(struct radeon_device *rdev, > struct radeon_ring *ring) > { > - u32 wptr; > - > - wptr = RREG32(R600_CP_RB_WPTR); > - > - return wptr; > + return RREG32(R600_CP_RB_WPTR); > } > > void r600_gfx_set_wptr(struct radeon_device *rdev,