From: Thippeswamy Havalige <thippeswamy.havalige@amd.com>
To: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>, <krzysztof.kozlowski@linaro.org>
Cc: <bhelgaas@google.com>, <michals@xilinx.com>, <robh+dt@kernel.org>,
<lorenzo.pieralisi@arm.com>, <bharat.kumar.gogada@amd.com>,
"Thippeswamy Havalige" <thippeswamy.havalige@amd.com>
Subject: [PATCH 06/13] microblaze/PCI: Remove unused allocation & free of PCI host bridge structure
Date: Tue, 25 Oct 2022 12:22:07 +0530 [thread overview]
Message-ID: <20221025065214.4663-7-thippeswamy.havalige@amd.com> (raw)
In-Reply-To: <20221025065214.4663-1-thippeswamy.havalige@amd.com>
Remove unused allocation and freeing of PCI host bridge structure.
Signed-off-by: Thippeswamy Havalige <thippeswamy.havalige@amd.com>
---
arch/microblaze/include/asm/pci-bridge.h | 5 -----
arch/microblaze/pci/pci-common.c | 29 -----------------------------
arch/microblaze/pci/xilinx_pci.c | 6 ------
3 files changed, 40 deletions(-)
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h
index 252bcc1..018c632 100644
--- a/arch/microblaze/include/asm/pci-bridge.h
+++ b/arch/microblaze/include/asm/pci-bridge.h
@@ -25,7 +25,6 @@ static inline int pcibios_vaddr_is_ioport(void __iomem *address)
*/
struct pci_controller {
struct pci_bus *bus;
- char is_dynamic;
struct device_node *dn;
struct list_head list_node;
struct device *parent;
@@ -98,9 +97,5 @@ extern void setup_indirect_pci(struct pci_controller *hose,
resource_size_t cfg_addr,
resource_size_t cfg_data, u32 flags);
-/* Allocate & free a PCI host bridge structure */
-extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);
-extern void pcibios_free_controller(struct pci_controller *phb);
-
#endif /* __KERNEL__ */
#endif /* _ASM_MICROBLAZE_PCI_BRIDGE_H */
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 12764df0..2965892 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -38,9 +38,6 @@
static DEFINE_SPINLOCK(hose_spinlock);
LIST_HEAD(hose_list);
-/* XXX kill that some day ... */
-static int global_phb_number; /* Global phb counter */
-
/* ISA Memory physical address */
resource_size_t isa_mem_base;
@@ -49,32 +46,6 @@
static int pci_bus_count;
-struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
-{
- struct pci_controller *phb;
-
- phb = zalloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);
- if (!phb)
- return NULL;
- spin_lock(&hose_spinlock);
- phb->global_number = global_phb_number++;
- list_add_tail(&phb->list_node, &hose_list);
- spin_unlock(&hose_spinlock);
- phb->dn = dev;
- phb->is_dynamic = mem_init_done;
- return phb;
-}
-
-void pcibios_free_controller(struct pci_controller *phb)
-{
- spin_lock(&hose_spinlock);
- list_del(&phb->list_node);
- spin_unlock(&hose_spinlock);
-
- if (phb->is_dynamic)
- kfree(phb);
-}
-
static resource_size_t pcibios_io_size(const struct pci_controller *hose)
{
return resource_size(&hose->io_resource);
diff --git a/arch/microblaze/pci/xilinx_pci.c b/arch/microblaze/pci/xilinx_pci.c
index f1a5112..3fa16e3 100644
--- a/arch/microblaze/pci/xilinx_pci.c
+++ b/arch/microblaze/pci/xilinx_pci.c
@@ -97,12 +97,6 @@ void __init xilinx_pci_init(void)
return;
}
- hose = pcibios_alloc_controller(pci_node);
- if (!hose) {
- pr_err("xilinx-pci: pcibios_alloc_controller() failed\n");
- return;
- }
-
/* Setup config space */
setup_indirect_pci(hose, r.start + XPLB_PCI_ADDR,
r.start + XPLB_PCI_DATA,
--
1.8.3.1
next prev parent reply other threads:[~2022-10-25 6:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-25 6:52 [PATCH 00/13] Remove unused microblaze PCIe bus architecture Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 01/13] microblaze/PCI: Remove unused early_read_config_byte() et al declarations Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 02/13] microblaze/PCI: Remove Null PCI config access unused functions Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 03/13] microblaze/PCI: Remove unused PCI bus scan if configured as a host Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 04/13] microblaze/PCI: Remove unused PCI legacy IO's access on a bus Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 05/13] microblaze/PCI: Remove unused device tree parsing for a host bridge resources Thippeswamy Havalige
2022-10-25 6:52 ` Thippeswamy Havalige [this message]
2022-10-25 6:52 ` [PATCH 07/13] microblaze/PCI: Remove unused PCI BIOS resource allocation Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 08/13] microblaze/PCI: Remove unused PCI Indirect ops Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 09/13] microblaze/PCI: Remove unused pci_address_to_pio() conversion of CPU address to I/O port Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 10/13] microblaze/PCI: Remove unused sys_pciconfig_iobase() and et al declaration Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 11/13] microblaze/PCI: Remove unused pci_iobar_pfn() and et al declarations Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 12/13] microblaze/PCI: Remove support for Xilinx PCI host bridge Thippeswamy Havalige
2022-10-25 6:52 ` [PATCH 13/13] microblaze/PCI: Moving PCI iounmap and dependent code Thippeswamy Havalige
2022-10-25 7:31 ` [PATCH 00/13] Remove unused microblaze PCIe bus architecture Michal Simek
2022-10-25 8:26 ` Havalige, Thippeswamy
2022-10-25 9:22 ` Michal Simek
2022-10-25 14:07 ` Havalige, Thippeswamy
2022-10-27 9:46 ` Lorenzo Pieralisi
2022-11-04 8:56 ` Havalige, Thippeswamy
2022-11-25 10:39 ` Michal Simek
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=20221025065214.4663-7-thippeswamy.havalige@amd.com \
--to=thippeswamy.havalige@amd.com \
--cc=bharat.kumar.gogada@amd.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=michals@xilinx.com \
--cc=robh+dt@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
all inboxes | Powered by JetHome®