From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965175AbdJQPje (ORCPT ); Tue, 17 Oct 2017 11:39:34 -0400 Received: from mout.web.de ([212.227.15.3]:51343 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934122AbdJQPj3 (ORCPT ); Tue, 17 Oct 2017 11:39:29 -0400 Subject: [PATCH 2/3] powernv/pci: Use common code in pnv_ioda_pick_m64_pe() From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, Alexey Kardashevskiy , Alistair Popple , Benjamin Herrenschmidt , David Gibson , Gavin Shan , Michael Ellerman , Paul Mackerras , Rob Herring , Russell Currey Cc: LKML , kernel-janitors@vger.kernel.org References: <549d0b6b-f875-c524-d867-742745117c1e@users.sourceforge.net> Message-ID: <84df26ea-74a3-14e5-9f13-a35486e9a95d@users.sourceforge.net> Date: Tue, 17 Oct 2017 17:39:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <549d0b6b-f875-c524-d867-742745117c1e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:1D2fFL4VOouri497Edgo3Itaixx/7vc1Scp0JWdPbOelMilW46J cvEoUj3Gg6vN9rzJSMEXK/eCvMQBKh65V9WPfBKRopEOVgVr8fbSzkPbTVIwIJLHuv+Q3TP NbGKejVDjDucJzn/uGN78pA8LEOM+FwnybGdUZvY+7nsO4zI75UgR8vspkwVVWgL2Mr3frC cM3zAV5/SEZ8xr9+0TUPA== X-UI-Out-Filterresults: notjunk:1;V01:K0:PeePywgR8DU=:KnRvvM5ZufdQhiWspKwAUU 8RzrrnFYx67109snt5xo5VsmfwBQRZoqqBhZBlGZrHLBLUtD+c4DJyK6da038k8rcHf60Wn0m uXzuGYvVdo3jVpJ240u9qMYoGYs/Gf19lQB+yXkiyGCO3wjetk+HqO+V3OSvRvF5/hsVciekI PFGAF6EnhItI3dUaDusiJbQDw9nX/fG1WgxqXayN1MO6v/3F5sEkEdh5AgR253biQVgt9CNMo +WwIW4GeRklA2kw4nxgfAVQNHtuDX38Db7HLhFMWV9T9kVX3REQ7x9eiJbE0uCusmePPsuFIR 7ZVvdDhwia6mnK/3K8ulAx4IYB/CuY5aFIs6th75AVtDvJ7wm/NnoJZtxA8h7sznqom1nnwwR TD0jLM2IU7n0pqep+XrBzYl8l4eEqGFFT38iM5JoWJZE1k1cqEVOtRHiwI7hBM/Dj0g4p7bw/ 9i736TcSa3ghpInUJuZEp+drkyZ1WmkqfR1rHD9slmvqJK/chot6UtcPjZZ0Vjqu3ho+elH9B wjSGoADrmC/HRkW3GooxkOD3w5pG1BkKrky0FJlR6aAS/SrQ+tHkF8X4qYNjZ9ypGXsYTO+L9 UuDrr7IqPcuTyaW+Fn7GzC1zbV9/p07We5IhL6yZzH/uX0WW0UoNyJESfLRD/SJhRzH1yXPcI OyckpPLDKl69OlZ0vaPVIlChYosywg/wiFUKdyY4ysquipB4IdFEfnPK2DO2JOET7IpgLIbJ4 /zqLLrVnkS2ZxXS54XjSYiA8YG8kLquhP80yKGdtuTbJrdIbb/WC9kSs3XiK8HlhQ58XsVPIV odhW2gbYkjudwEosT6zt0/5qfuEcifOZvGcKz1Ix//n2Zvsc6o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 17 Oct 2017 17:07:54 +0200 Add a jump target so that a bit of code can be better reused at the end of this function. Signed-off-by: Markus Elfring --- arch/powerpc/platforms/powernv/pci-ioda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 17c0330bb059..98d9435240f4 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -364,21 +364,20 @@ static struct pnv_ioda_pe *pnv_ioda_pick_m64_pe(struct pci_bus *bus, bool all) /* Figure out reserved PE numbers by the PE */ pnv_ioda_reserve_m64_pe(bus, pe_alloc, all); + master_pe = NULL; + /* * the current bus might not own M64 window and that's all * contributed by its child buses. For the case, we needn't * pick M64 dependent PE#. */ - if (bitmap_empty(pe_alloc, phb->ioda.total_pe_num)) { - kfree(pe_alloc); - return NULL; - } + if (bitmap_empty(pe_alloc, phb->ioda.total_pe_num)) + goto free_pe; /* * Figure out the master PE and put all slave PEs to master * PE's list to form compound PE. */ - master_pe = NULL; i = -1; while ((i = find_next_bit(pe_alloc, phb->ioda.total_pe_num, i + 1)) < phb->ioda.total_pe_num) { @@ -416,6 +415,7 @@ static struct pnv_ioda_pe *pnv_ioda_pick_m64_pe(struct pci_bus *bus, bool all) } } +free_pe: kfree(pe_alloc); return master_pe; } -- 2.14.2