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

Commit f495a8bf authored by Jon Loeliger's avatar Jon Loeliger Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Remove sections use from ppc 



Here is a new patch that removes all notion of the pmac, prep,
chrp and openfirmware initialization sections, and then unifies
the sections.h files without those __pmac, etc, sections identifiers
cluttering things up.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7da8f860

arch/ppc/kernel/pci.c

+5 −5
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ pcibios_alloc_controller(void) 
/*

 * Functions below are used on OpenFirmware machines.

 */

static void __openfirmware

static void

make_one_node_map(struct device_node* node, u8 pci_bus)

{

	int *bus_range;
@@ -678,7 +678,7 @@ make_one_node_map(struct device_node* node, u8 pci_bus) 
	}

}

	

void __openfirmware

void

pcibios_make_OF_bus_map(void)

{

	int i;
@@ -720,7 +720,7 @@ pcibios_make_OF_bus_map(void) 


typedef int (*pci_OF_scan_iterator)(struct device_node* node, void* data);



static struct device_node* __openfirmware

static struct device_node*

scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void* data)

{

	struct device_node* sub_node;
@@ -761,7 +761,7 @@ scan_OF_pci_childs_iterator(struct device_node* node, void* data) 
	return 0;

}



static struct device_node* __openfirmware

static struct device_node*

scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn)

{

	u8 filter_data[2] = {bus, dev_fn};
@@ -842,7 +842,7 @@ pci_find_hose_for_OF_device(struct device_node* node) 
	return NULL;

}



static int __openfirmware

static int

find_OF_pci_device_filter(struct device_node* node, void* data)

{

	return ((void *)node == data);

arch/ppc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ early_init(int r3, int r4, int r5) 
 * Assume here that all clock rates are the same in a

 * smp system.  -- Cort

 */

int __openfirmware

int

of_show_percpuinfo(struct seq_file *m, int i)

{

	struct device_node *cpu_node;

arch/ppc/platforms/chrp_pci.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void __iomem *gg2_pci_config_base; 
 * limit the bus number to 3 bits

 */



int __chrp gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,

int gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,

			   int len, u32 *val)

{

	volatile void __iomem *cfg_data;
@@ -56,7 +56,7 @@ int __chrp gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off, 
	return PCIBIOS_SUCCESSFUL;

}



int __chrp gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,

int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,

			    int len, u32 val)

{

	volatile void __iomem *cfg_data;
@@ -92,7 +92,7 @@ static struct pci_ops gg2_pci_ops = 
/*

 * Access functions for PCI config space using RTAS calls.

 */

int __chrp

int

rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,

		 int len, u32 *val)

{
@@ -108,7 +108,7 @@ rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset, 
	return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;

}



int __chrp

int

rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,

		  int len, u32 val)

{

arch/ppc/platforms/chrp_setup.c

+8 −8
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static const char *gg2_cachemodes[4] = { 
	"Disabled", "Write-Through", "Copy-Back", "Transparent Mode"

};



int __chrp

int

chrp_show_cpuinfo(struct seq_file *m)

{

	int i, sdramen;
@@ -303,7 +303,7 @@ void __init chrp_setup_arch(void) 
	pci_create_OF_bus_map();

}



void __chrp

void

chrp_event_scan(void)

{

	unsigned char log[1024];
@@ -314,7 +314,7 @@ chrp_event_scan(void) 
	ppc_md.heartbeat_count = ppc_md.heartbeat_reset;

}



void __chrp

void

chrp_restart(char *cmd)

{

	printk("RTAS system-reboot returned %d\n",
@@ -322,7 +322,7 @@ chrp_restart(char *cmd) 
	for (;;);

}



void __chrp

void

chrp_power_off(void)

{

	/* allow power on only with power button press */
@@ -331,13 +331,13 @@ chrp_power_off(void) 
	for (;;);

}



void __chrp

void

chrp_halt(void)

{

	chrp_power_off();

}



u_int __chrp

u_int

chrp_irq_canonicalize(u_int irq)

{

	if (irq == 2)
@@ -572,7 +572,7 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5, 
	if (ppc_md.progress) ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0x0);

}



void __chrp

void

rtas_display_progress(char *s, unsigned short hex)

{

	int width;
@@ -599,7 +599,7 @@ rtas_display_progress(char *s, unsigned short hex) 
	call_rtas( "display-character", 1, 1, NULL, ' ' );

}



void __chrp

void

rtas_indicator_progress(char *s, unsigned short hex)

{

	call_rtas("set-indicator", 3, 1, NULL, 6, 0, hex);

arch/ppc/platforms/chrp_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ smp_chrp_take_timebase(void) 
}



/* CHRP with openpic */

struct smp_ops_t chrp_smp_ops __chrpdata = {

struct smp_ops_t chrp_smp_ops = {

	.message_pass = smp_openpic_message_pass,

	.probe = smp_chrp_probe,

	.kick_cpu = smp_chrp_kick_cpu,