From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753073AbdARNuX (ORCPT ); Wed, 18 Jan 2017 08:50:23 -0500 Received: from mout.web.de ([217.72.192.78]:51419 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbdARNuW (ORCPT ); Wed, 18 Jan 2017 08:50:22 -0500 Subject: [PATCH 3/3] AVR32: Return an error code only as a constant in sys_cacheflush() To: Haavard Skinnemoen , Hans-Christian Egtvedt References: <308dc151-c874-dfe7-64f9-24a63fc66883@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Wed, 18 Jan 2017 14:50:05 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <308dc151-c874-dfe7-64f9-24a63fc66883@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Y7IFgmBAiAiPV4NOdRLd72e306rC+dhnAqnlek4++kQ1KMuEPEq gGsm2pcInESm/xOb6u4twtyXi0mfzB8ca/K3EkvTm5+76imUZ4CS6Y60EZAG0gJaESYEeVC 6mLxN5HgL0nQlb15v9zcJMBZVH0JbgKh8wAvSAMMvn4hXls5FKtX3VvAbYPC1dVt66eCEKR DV7Xcp0RJq6pS+GGz7IZQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:zvfhHM3T+oI=:Kwa1rHn/8WURLJevMHgCHV /RXBJSX+cXiUkClcfro3qesHvmWcCH6KScmq7KIJ540d7cR7Eg+RwF76xLifkuyxckuIx0ZzH poSqIgoL3aLgJE5UmmPPfBCI5Gd7D72Wb1nQv4MrnQ5wIha3IjpDp7MAQPjXb3ezSvd8AQU2X aoEVDHtfqwKh6hXRMdHUP/xOkGV8mclWFBL89CYBP+nUoYZ6ordWk5YGdG4sFEbNsEA+CIaDK LtxCsFzxwMvrdu6/Fa33DCLSCCtHBTnp5oJdxoUYSQne/lKmUxqgkQuMQNfV9TbvRzqKFdoYk knSJ+TwIqqoXcClIE76j3zuzj29t0n0EJeriZjZ+UcByb9Cm/MmGfgLexDwiKPmBRQiRgU4Ei +eVHU6FwlTenCNZrgkjTRYRXdjIdtmzglWaxdPM5KuKdHFkyD0n6Z/y/XkbB1JEllvh6vnESs ZIXyG3/P6kCAgApOZ/6sO9r4wj+ARmPY5uoTkbYfSMEb6TvKcZQfsooIvrBboX74HuKseaDCC VKAPChBtD7bI0NpYFOKsWAdtvAkPvd/oBVe1Ai7Wjpv3LlBRwfSKOrHDl7YJp1HKcbm8TfJ+7 v4l4Y9SggdYQ/arxO/UH1/3+fspxaDlo4W3vvfPwWnIIxObvI+YlKj+EEXy/Xq1aGqMB44jYC /O0BwMWmpnqRhI6eFP7ByFa431taLhwtOhjMtxWaZmKyzUsxZqzmKtEjIL22XjsVU06znkuiU BFCyQQIIP/jLnDiCz7HKhtyh80OdCXHoWbpcaOyN63nbFTjA/5ByYThPVA6p1ekPDbQ98IPXk rKiMjP9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 18 Jan 2017 14:30:11 +0100 * Return an error code without storing it in an intermediate variable. * Delete the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/avr32/mm/cache.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c index 85d635cd7b28..c893e5944390 100644 --- a/arch/avr32/mm/cache.c +++ b/arch/avr32/mm/cache.c @@ -126,30 +126,19 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page) asmlinkage int sys_cacheflush(int operation, void __user *addr, size_t len) { - int ret; - - if (len > CACHEFLUSH_MAX_LEN) { - ret = -EPERM; - if (!capable(CAP_SYS_ADMIN)) - goto out; - } - - ret = -EFAULT; + if (len > CACHEFLUSH_MAX_LEN && !capable(CAP_SYS_ADMIN)) + return -EPERM; if (!access_ok(VERIFY_WRITE, addr, len)) - goto out; + return -EFAULT; switch (operation) { case CACHE_IFLUSH: flush_icache_range((unsigned long)addr, (unsigned long)addr + len); - ret = 0; - break; + return 0; default: - ret = -EINVAL; + return -EINVAL; } - -out: - return ret; } void copy_to_user_page(struct vm_area_struct *vma, struct page *page, -- 2.11.0