From patchwork Wed Jul 9 15:33:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4517771 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8ED79BEEAA for ; Wed, 9 Jul 2014 15:33:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8633220382 for ; Wed, 9 Jul 2014 15:33:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1D4F2037F for ; Wed, 9 Jul 2014 15:33:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932791AbaGIPdX (ORCPT ); Wed, 9 Jul 2014 11:33:23 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:63332 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932306AbaGIPdV (ORCPT ); Wed, 9 Jul 2014 11:33:21 -0400 Received: by mail-ig0-f176.google.com with SMTP id r10so2000439igi.9 for ; Wed, 09 Jul 2014 08:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding; bh=WZGYsfwZqcbE5umJDXmbt6TjMns6LXP1sL3vJGcoSNE=; b=fErTluZCErbFmM6K3JLPrGu4AlRHdgMjiI9AE6PEZ6lPnsPsF4vdpM5OWPhLfFtJ6S aiQTXUCcot5a/Ny0fGFX+YXA6EGJx8pjxpT1vsnxXJboAV47DYHps4NjgOsFBYCzzlkv TLxSnV3RV7lXXqcvHbtjAmc9PfioFsMwfU36VMlwmrNTEYECc7ziJ7RzwEDWPhLUn18R YUQqJ0DUxXyhUhBOSz/4n4Z+sEELp/IQSD/+N2BijfMoh0lU+X52fJhZ/Jyh1c1bG6Zt NtZudvDtu7AdaN2ggJrKkEMpxK4TbWECcUan6inT4FiDlENdWjGs/ygvYlWEk6UTqJ+v jd0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=WZGYsfwZqcbE5umJDXmbt6TjMns6LXP1sL3vJGcoSNE=; b=ON+JjJZTv7UlcWKIv1CBiylMfm+z60ZJvJFMD0hpTCplOun0ETcTHSsMu2AGW4V0xz wSs3TuzKe3bfAmMTo6bqxskrf7hJ/pPqxg7lbkaDVQFBC8XYrAddDASb2uI05ik0NGv2 J/yOAQvI/C5zf2viOyNxEvzJDzEtk02F6+ViNSe8pBgpPyWHT/AwoxA+pKfM3S+pRRwH 6mwyQhHVG2CywHEHFMxfSNx1mW5XMRHHIB/wapLizxOyPsRZxh/i1J5TtmhNtFUwpzjV 6fDY3bmkIznJOgmauu4rhq2tf+Ts+3+UD7fVdCWe0+6ZSLnIHyLY28AA9G3LSWV5c3n8 uK3Q== X-Gm-Message-State: ALoCoQmF1oejNaa/Qdcn+qnhTDjucVLUIXBEikWrW6Bxg1xsyFtE22jBsdy5cR6/grqvmm7JobJP X-Received: by 10.50.56.84 with SMTP id y20mr14037003igp.8.1404920000195; Wed, 09 Jul 2014 08:33:20 -0700 (PDT) Received: from localhost ([172.16.48.225]) by mx.google.com with ESMTPSA id j10sm16335046igv.17.2014.07.09.08.33.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 08:33:19 -0700 (PDT) Subject: [PATCH 1/3] PCI: Cleanup control flow To: linux-pci@vger.kernel.org From: Bjorn Helgaas Date: Wed, 09 Jul 2014 09:33:18 -0600 Message-ID: <20140709153318.1004.88406.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140709153252.1004.86246.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140709153252.1004.86246.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Return errors immediately so the straightline path is the normal, no-error path. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/pci/setup-res.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 481c4e18693a..532dc540dc5d 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -305,14 +305,16 @@ int pci_assign_resource(struct pci_dev *dev, int resno) if (ret < 0) ret = pci_revert_fw_address(res, dev, resno, size); - if (!ret) { - res->flags &= ~IORESOURCE_UNSET; - res->flags &= ~IORESOURCE_STARTALIGN; - dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res); - if (resno < PCI_BRIDGE_RESOURCES) - pci_update_resource(dev, resno); - } - return ret; + if (ret) + return ret; + + res->flags &= ~IORESOURCE_UNSET; + res->flags &= ~IORESOURCE_STARTALIGN; + dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res); + if (resno < PCI_BRIDGE_RESOURCES) + pci_update_resource(dev, resno); + + return 0; } EXPORT_SYMBOL(pci_assign_resource); @@ -335,19 +337,20 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz /* already aligned with min_align */ new_size = resource_size(res) + addsize; ret = _pci_assign_resource(dev, resno, new_size, min_align); - if (!ret) { - res->flags &= ~IORESOURCE_UNSET; - res->flags &= ~IORESOURCE_STARTALIGN; - dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res); - if (resno < PCI_BRIDGE_RESOURCES) - pci_update_resource(dev, resno); - } else { + if (ret) { res->flags = flags; dev_info(&dev->dev, "BAR %d: %pR (failed to expand by %#llx)\n", resno, res, (unsigned long long) addsize); + return ret; } - return ret; + res->flags &= ~IORESOURCE_UNSET; + res->flags &= ~IORESOURCE_STARTALIGN; + dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res); + if (resno < PCI_BRIDGE_RESOURCES) + pci_update_resource(dev, resno); + + return 0; } int pci_enable_resources(struct pci_dev *dev, int mask)