From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751340AbdAUSLb (ORCPT ); Sat, 21 Jan 2017 13:11:31 -0500 Received: from mout.web.de ([212.227.17.12]:55830 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbdAUSLX (ORCPT ); Sat, 21 Jan 2017 13:11:23 -0500 Subject: [PATCH 2/5] s390/pci: Return directly after a failed clp_alloc_block() in clp_normal_command() To: linux-s390@vger.kernel.org, =?UTF-8?Q?Gerald_Sch=c3=a4fer?= , Heiko Carstens , Martin Schwidefsky , Sebastian Ott References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Sat, 21 Jan 2017 19:11:15 +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: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:14r4LYkh+GtKq84XOl1H9Li2lFvJ1/w40MZcPi/CueCHmYpNgXu GZPTasuvTOeUBZ3ETRj2Wr5AOu4NRuiOp0EcwCqoub0Lk4HufNV73OQXZ2h+vqKte9zoyhH AGU5gzqLErivWqj6y0S6bbBywmn74n1zrjkWBZ+93J7ogfvPbNlVubIZ8cIqGTK2jUrq5Oi zeiCsM/Xg5up9Mi83x+KA== X-UI-Out-Filterresults: notjunk:1;V01:K0:6tg0hLuNks0=:QIj1o7Xp1Q3BHRv/CWdd1p 0guLM6FLwsxwiUHfHzg4spytwgCLkc6G75+08GTiP/W/4DzynbzU85MVqe6uBlJlfmRKuug3F TtATSbu9GGpXedXCYRbAr022KUzasgQDDM1nr8L28B3HrGzz8JoFfRmWr2CIGhM7mU+wOKC+G LFORZcJ8aSI4ULZUeyglWHLsYiSSj35GD8qqYFrgSyJ8+jk1ym/8HqS+UmJtwrAbIrD3/6yqM GlH1j5V9rhcwk1Z0KazevfVRk8Vn+gZCow4/8nhv9c7NQBqsAeZdVtpjWffvCgCPmCR/0wfrj 3w6CiCU+F1ZoT4Hs/vvymROSCI/1Q1TLKLwDelw5EyF9GDbQpCYAaYj0Qjke3mlWf4uEGKI7L Y0TX+7d+azAkWSnivo98wjoMJ1qrkDM1YNHYPYZLOTapq4Aehn8wcFfFBAI+Fg28DFaBSdrIo q65he2gYibW7NkptRN9bBzu7j7orGJwFusB4oBO8xtqZIqCwx6Rwrnu7H2sxK8/g1Q3a42kWA J3hKjfv0Qk/7LBqYZT2kbv2dAUDDh1UY9JmFJYKuy9VGQYOQKHMDchtYPCSPmuh6S6Sn8QKDU n3RIuGE3r6wJFzAfIk0ZDOBSNm6NoyGVICs/R97DXypANzk3i/FrVScUp1XFwaR3glx1Lrcbg S7Ac1XMvQtwUx/z7meCV4VqGaQHTq94CQLMHD7QzLyLZsKS5X3VcU5Bx0ywNyKKOXF543c+2U t+9V2slVpE9HZd4VmwlVRAozVc5ddRjevV+MyGiyhEr7hYtPx5zR9R5RQG+ZoGKjUqMc0Rnzu SQINdfZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 21 Jan 2017 17:56:40 +0100 * Return directly after a call of the function "clp_alloc_block" failed here. * Delete the jump label "out" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/s390/pci/pci_clp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c index 4f5a1bf3b14b..28e13fa7a79c 100644 --- a/arch/s390/pci/pci_clp.c +++ b/arch/s390/pci/pci_clp.c @@ -517,10 +517,9 @@ static int clp_normal_command(struct clp_req *req) if (req->lps != 0 && req->lps != 2) return -EINVAL; - rc = -ENOMEM; lpcb = clp_alloc_block(GFP_KERNEL); if (!lpcb) - goto out; + return -ENOMEM; rc = -EFAULT; uptr = (void __force __user *)(unsigned long) req->data_p; @@ -550,7 +549,6 @@ static int clp_normal_command(struct clp_req *req) out_free: clp_free_block(lpcb); -out: return rc; } -- 2.11.0