From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [PATCH 1/5] powerpc/pci: Fold pcibios_setup_device() into pcibios_bus_add_device()
Date: Fri, 10 Jan 2020 18:02:03 +1100 [thread overview]
Message-ID: <20200110070207.439-2-oohall@gmail.com> (raw)
In-Reply-To: <20200110070207.439-1-oohall@gmail.com>
pcibios_bus_add_device() is the only caller of pcibios_setup_device().
Fold them together since there's no real reason to keep them separate.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
arch/powerpc/kernel/pci-common.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index f8a59d7..c6c0341 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -958,7 +958,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus)
phb->controller_ops.dma_bus_setup(bus);
}
-static void pcibios_setup_device(struct pci_dev *dev)
+void pcibios_bus_add_device(struct pci_dev *dev)
{
struct pci_controller *phb;
/* Fixup NUMA node as it may not be setup yet by the generic
@@ -979,15 +979,9 @@ static void pcibios_setup_device(struct pci_dev *dev)
pci_read_irq_line(dev);
if (ppc_md.pci_irq_fixup)
ppc_md.pci_irq_fixup(dev);
-}
-
-void pcibios_bus_add_device(struct pci_dev *pdev)
-{
- /* Perform platform-specific device setup */
- pcibios_setup_device(pdev);
if (ppc_md.pcibios_bus_add_device)
- ppc_md.pcibios_bus_add_device(pdev);
+ ppc_md.pcibios_bus_add_device(dev);
}
int pcibios_add_device(struct pci_dev *dev)
--
2.9.5
next prev parent reply other threads:[~2020-01-10 7:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 7:02 Minor PCI & DMA init cleanups Oliver O'Halloran
2020-01-10 7:02 ` Oliver O'Halloran [this message]
2020-01-14 6:33 ` [PATCH 1/5] powerpc/pci: Fold pcibios_setup_device() into pcibios_bus_add_device() Alexey Kardashevskiy
2020-01-29 5:17 ` Michael Ellerman
2020-01-10 7:02 ` [PATCH 2/5] powernv/pci: Remove dma_dev_setup() for NPU PHBs Oliver O'Halloran
2020-01-10 7:02 ` [PATCH 3/5] powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() Oliver O'Halloran
2020-01-14 6:33 ` Alexey Kardashevskiy
2020-01-10 7:02 ` [PATCH 4/5] powernv/pci: Fold pnv_pci_dma_dev_setup() into the pci-ioda.c version Oliver O'Halloran
2020-01-14 6:33 ` Alexey Kardashevskiy
2020-01-10 7:02 ` [PATCH 5/5] powernv/pci: Move pnv_pci_dma_bus_setup() to pci-ioda.c Oliver O'Halloran
2020-01-14 6:34 ` Alexey Kardashevskiy
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=20200110070207.439-2-oohall@gmail.com \
--to=oohall@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.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).