From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 04/12] PCI: Kill pci_is_reassignedev()
Date: Tue, 13 Mar 2012 00:26:26 -0700 [thread overview]
Message-ID: <1331623594-30543-5-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1331623594-30543-1-git-send-email-yinghai@kernel.org>
Only one user. Just use pci_specified_resource_alignement() directly.
So could only get get align one time for the dev that in the list
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/pci.c | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b832f0f..32ab301 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3682,18 +3682,6 @@ resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
return align;
}
-/**
- * pci_is_reassigndev - check if specified PCI is target device to reassign
- * @dev: the PCI device to check
- *
- * RETURNS: non-zero for PCI device is a target device to reassign,
- * or zero is not.
- */
-int pci_is_reassigndev(struct pci_dev *dev)
-{
- return (pci_specified_resource_alignment(dev) != 0);
-}
-
/*
* This function disables memory decoding and releases memory resources
* of the device specified by kernel's boot parameter 'pci=resource_alignment='.
@@ -3708,7 +3696,9 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
resource_size_t align, size;
u16 command;
- if (!pci_is_reassigndev(dev))
+ /* check if specified PCI is target device to reassign */
+ align = pci_specified_resource_alignment(dev);
+ if (!align)
return;
if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
@@ -3724,7 +3714,6 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
command &= ~PCI_COMMAND_MEMORY;
pci_write_config_word(dev, PCI_COMMAND, command);
- align = pci_specified_resource_alignment(dev);
for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
r = &dev->resource[i];
if (!(r->flags & IORESOURCE_MEM))
--
1.7.7
next prev parent reply other threads:[~2012-03-13 7:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 7:26 [PATCH 00/12] PCI, x86: More pci hotplug related cleanup Yinghai Lu
2012-03-13 7:26 ` [PATCH 01/12] PCI: Add debug print out for pci related dev release Yinghai Lu
2012-03-13 7:26 ` [PATCH 02/12] x86, PCI: Let pcibios_allocate_bus_resources() take bus instead Yinghai Lu
2012-03-13 7:26 ` [PATCH 03/12] PCI: Claim hw/fw allocated resources in hot add path Yinghai Lu
2012-03-13 7:26 ` Yinghai Lu [this message]
2012-03-13 7:26 ` [PATCH 05/12] PCI: Add addon_resource support for pci_dev Yinghai Lu
2012-03-15 21:30 ` Bjorn Helgaas
2012-03-16 3:23 ` Yinghai Lu
2012-03-13 7:26 ` [PATCH 06/12] PCI: Use for_each_pci_dev_resource helper Yinghai Lu
2012-03-13 7:26 ` [PATCH 07/12] PCI: Make piix4 quirk to use addon_resource support Yinghai Lu
2012-03-15 21:36 ` Bjorn Helgaas
2012-03-13 7:26 ` [PATCH 08/12] PCI: Make quirk_io_region " Yinghai Lu
2012-03-13 7:26 ` [PATCH 09/12] PCI: Use addon_fixed_resource with ati fixed resource Yinghai Lu
2012-03-13 7:26 ` [PATCH 10/12] PCI, pciehp: Separate pci_hp_add_bridge() Yinghai Lu
2012-03-15 21:42 ` Bjorn Helgaas
2012-03-13 7:26 ` [PATCH 11/12] PCI, cphi_hotplug: Simplify configure_slot Yinghai Lu
2012-03-13 7:26 ` [PATCH 12/12] PCI, shpchp: Simplify configure_device Yinghai Lu
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=1331623594-30543-5-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--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;
as well as URLs for NNTP newsgroup(s).