From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Tony Luck <tony.luck@intel.com>,
linux-ia64@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH 05/13] IA64/PCI: Use new pci_is_bridge() to simplify code
Date: Fri, 25 Apr 2014 09:18:27 +0000 [thread overview]
Message-ID: <1398417515-8740-6-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1398417515-8740-1-git-send-email-wangyijing@huawei.com>
Now we can use new pci_is_bridge() helper function
to simplify code.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
arch/ia64/pci/fixup.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c
index eee069a..1fe9aa5 100644
--- a/arch/ia64/pci/fixup.c
+++ b/arch/ia64/pci/fixup.c
@@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
* type BRIDGE, or CARDBUS. Host to PCI controllers use
* PCI header type NORMAL.
*/
- if (bridge
- &&((bridge->hdr_type = PCI_HEADER_TYPE_BRIDGE)
- ||(bridge->hdr_type = PCI_HEADER_TYPE_CARDBUS))) {
+ if (bridge && (pci_is_bridge(bridge))) {
pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
&config);
if (!(config & PCI_BRIDGE_CTL_VGA))
--
1.7.1
next prev parent reply other threads:[~2014-04-25 9:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 9:18 [PATCH 00/13] Refactor pci_is_brdige() to simplify code Yijing Wang
2014-04-25 9:18 ` [PATCH 01/13] PCI: rename pci_is_bridge() to pci_has_subordinate() Yijing Wang
2014-04-25 9:18 ` [PATCH 02/13] PCI: Introduce new pci_is_bridge() helper function Yijing Wang
2014-04-25 9:18 ` [PATCH 03/13] PCI: Use new pci_is_bridge() to simplify code Yijing Wang
2014-04-25 9:18 ` [PATCH 04/13] x86/PCI: " Yijing Wang
2014-04-25 9:18 ` Yijing Wang [this message]
2014-04-25 9:18 ` [PATCH 06/13] powerpc/PCI: " Yijing Wang
2014-04-25 9:18 ` [PATCH 07/13] sparc/PCI: " Yijing Wang
2014-04-25 16:49 ` David Miller
2014-04-25 9:18 ` [PATCH 08/13] PCI, rpaphp: " Yijing Wang
2014-04-28 0:43 ` Benjamin Herrenschmidt
2014-04-25 9:18 ` [PATCH 09/13] PCI, shpchp: " Yijing Wang
2014-04-25 9:18 ` [PATCH 10/13] PCI, cpcihp: " Yijing Wang
2014-04-25 9:18 ` [PATCH 11/13] PCI, acpiphp: " Yijing Wang
2014-04-25 9:18 ` [PATCH 12/13] PCI, pcmcia: " Yijing Wang
2014-04-25 9:18 ` [PATCH 13/13] PCI, pciehp: " Yijing Wang
2014-04-25 9:42 ` [PATCH 00/13] Refactor pci_is_brdige() " David Laight
2014-04-26 2:49 ` Yijing Wang
2014-04-30 16:29 ` Bjorn Helgaas
2014-05-04 4:16 ` Yijing Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398417515-8740-6-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox