Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b82b3e4 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Paul Mackerras
Browse files

powerpc: Remove `have_of' global variable 



The `have_of' variable is a relic from the arch/ppc time, it isn't
useful nowadays.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0efbb57e

arch/powerpc/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ extern int _prep_type; 


#ifdef __KERNEL__



extern int have_of;



struct task_struct;

void start_thread(struct pt_regs *regs, unsigned long fdptr, unsigned long sp);

void release_thread(struct task_struct *);

arch/powerpc/kernel/pci-common.c

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ EXPORT_SYMBOL(pci_domain_nr); 
 */

struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)

{

	if (!have_of)

		return NULL;

	while(node) {

		struct pci_controller *hose, *tmp;

		list_for_each_entry_safe(hose, tmp, &hose_list, list_node)

arch/powerpc/kernel/pci_32.c

+1 −6
Original line number Diff line number Diff line
@@ -266,9 +266,6 @@ pci_busdev_to_OF_node(struct pci_bus *bus, int devfn) 
{

	struct device_node *parent, *np;



	if (!have_of)

		return NULL;



	pr_debug("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn);

	parent = scan_OF_for_pci_bus(bus);

	if (parent == NULL)
@@ -309,8 +306,6 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn) 
	struct pci_controller* hose;

	struct pci_dev* dev = NULL;

	

	if (!have_of)

		return -ENODEV;

	/* Make sure it's really a PCI device */

	hose = pci_find_hose_for_OF_device(node);

	if (!hose || !hose->dn)
@@ -431,7 +426,7 @@ static int __init pcibios_init(void) 
	 * numbers vs. kernel bus numbers since we may have to

	 * remap them.

	 */

	if (pci_assign_all_buses && have_of)

	if (pci_assign_all_buses)

		pcibios_make_OF_bus_map();



	/* Call common code to handle resource allocation */

arch/powerpc/kernel/setup_32.c

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ unsigned long ISA_DMA_THRESHOLD; 
unsigned int DMA_MODE_READ;

unsigned int DMA_MODE_WRITE;



int have_of = 1;



#ifdef CONFIG_VGA_CONSOLE

unsigned long vgacon_remap_base;

EXPORT_SYMBOL(vgacon_remap_base);

arch/powerpc/kernel/setup_64.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
#define DBG(fmt...)

#endif



int have_of = 1;

int boot_cpuid = 0;

u64 ppc64_pft_size;