Commit 4308e3c9 authored by Thippeswamy Havalige's avatar Thippeswamy Havalige Committed by Michal Simek
Browse files

microblaze/PCI: Remove unused allocation & free of PCI host bridge structure 



Remove unused allocation and freeing of PCI host bridge structure.

Signed-off-by: default avatarThippeswamy Havalige <thippeswamy.havalige@amd.com>
Link: https://lore.kernel.org/r/20221025065214.4663-7-thippeswamy.havalige@amd.com


Signed-off-by: default avatarMichal Simek <michal.simek@amd.com>
parent 3d6010ec

arch/microblaze/include/asm/pci-bridge.h

+0 −5
Original line number Diff line number Diff line
@@ -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 */

arch/microblaze/pci/pci-common.c

+0 −29
Original line number Diff line number Diff line
@@ -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 @@ EXPORT_SYMBOL(isa_io_base); 


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);

arch/microblaze/pci/xilinx_pci.c

+0 −6
Original line number Diff line number Diff line
@@ -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,