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

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

[PATCH] powerpc: Remove sections use from ppc64 and drivers 



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 f495a8bf

arch/ppc64/kernel/pmac_feature.c

+30 −30
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
 * We use a single global lock to protect accesses. Each driver has

 * to take care of its own locking

 */

static DEFINE_SPINLOCK(feature_lock  __pmacdata);

static DEFINE_SPINLOCK(feature_lock);



#define LOCK(flags)	spin_lock_irqsave(&feature_lock, flags);

#define UNLOCK(flags)	spin_unlock_irqrestore(&feature_lock, flags);
@@ -62,9 +62,9 @@ static DEFINE_SPINLOCK(feature_lock __pmacdata); 
/*

 * Instance of some macio stuffs

 */

struct macio_chip macio_chips[MAX_MACIO_CHIPS]  __pmacdata;

struct macio_chip macio_chips[MAX_MACIO_CHIPS] ;



struct macio_chip* __pmac macio_find(struct device_node* child, int type)

struct macio_chip* macio_find(struct device_node* child, int type)

{

	while(child) {

		int	i;
@@ -79,7 +79,7 @@ struct macio_chip* __pmac macio_find(struct device_node* child, int type) 
}

EXPORT_SYMBOL_GPL(macio_find);



static const char* macio_names[] __pmacdata =

static const char* macio_names[] =

{

	"Unknown",

	"Grand Central",
@@ -106,9 +106,9 @@ static const char* macio_names[] __pmacdata = 
#define UN_BIS(r,v)	(UN_OUT((r), UN_IN(r) | (v)))

#define UN_BIC(r,v)	(UN_OUT((r), UN_IN(r) & ~(v)))



static struct device_node* uninorth_node __pmacdata;

static u32* uninorth_base __pmacdata;

static u32 uninorth_rev __pmacdata;

static struct device_node* uninorth_node;

static u32* uninorth_base;

static u32 uninorth_rev;

static void *u3_ht;



extern struct device_node *k2_skiplist[2];
@@ -133,14 +133,14 @@ struct pmac_mb_def 
	struct feature_table_entry* 	features;

	unsigned long			board_flags;

};

static struct pmac_mb_def pmac_mb __pmacdata;

static struct pmac_mb_def pmac_mb;



/*

 * Here are the chip specific feature functions

 */





static long __pmac g5_read_gpio(struct device_node* node, long param, long value)

static long g5_read_gpio(struct device_node* node, long param, long value)

{

	struct macio_chip* macio = &macio_chips[0];
@@ -148,7 +148,7 @@ static long __pmac g5_read_gpio(struct device_node* node, long param, long value 
}





static long __pmac g5_write_gpio(struct device_node* node, long param, long value)

static long g5_write_gpio(struct device_node* node, long param, long value)

{

	struct macio_chip* macio = &macio_chips[0];
@@ -156,7 +156,7 @@ static long __pmac g5_write_gpio(struct device_node* node, long param, long valu 
	return 0;

}



static long __pmac g5_gmac_enable(struct device_node* node, long param, long value)

static long g5_gmac_enable(struct device_node* node, long param, long value)

{

	struct macio_chip* macio = &macio_chips[0];

	unsigned long flags;
@@ -181,7 +181,7 @@ static long __pmac g5_gmac_enable(struct device_node* node, long param, long val 
	return 0;

}



static long __pmac g5_fw_enable(struct device_node* node, long param, long value)

static long g5_fw_enable(struct device_node* node, long param, long value)

{

	struct macio_chip* macio = &macio_chips[0];

	unsigned long flags;
@@ -206,7 +206,7 @@ static long __pmac g5_fw_enable(struct device_node* node, long param, long value 
	return 0;

}



static long __pmac g5_mpic_enable(struct device_node* node, long param, long value)

static long g5_mpic_enable(struct device_node* node, long param, long value)

{

	unsigned long flags;
@@ -220,7 +220,7 @@ static long __pmac g5_mpic_enable(struct device_node* node, long param, long val 
	return 0;

}



static long __pmac g5_eth_phy_reset(struct device_node* node, long param, long value)

static long g5_eth_phy_reset(struct device_node* node, long param, long value)

{

	struct macio_chip* macio = &macio_chips[0];

	struct device_node *phy;
@@ -250,7 +250,7 @@ static long __pmac g5_eth_phy_reset(struct device_node* node, long param, long v 
	return 0;

}



static long __pmac g5_i2s_enable(struct device_node *node, long param, long value)

static long g5_i2s_enable(struct device_node *node, long param, long value)

{

	/* Very crude implementation for now */

	struct macio_chip* macio = &macio_chips[0];
@@ -275,7 +275,7 @@ static long __pmac g5_i2s_enable(struct device_node *node, long param, long valu 




#ifdef CONFIG_SMP

static long __pmac g5_reset_cpu(struct device_node* node, long param, long value)

static long g5_reset_cpu(struct device_node* node, long param, long value)

{

	unsigned int reset_io = 0;

	unsigned long flags;
@@ -320,12 +320,12 @@ static long __pmac g5_reset_cpu(struct device_node* node, long param, long value 
 * This takes the second CPU off the bus on dual CPU machines

 * running UP

 */

void __pmac g5_phy_disable_cpu1(void)

void g5_phy_disable_cpu1(void)

{

	UN_OUT(U3_API_PHY_CONFIG_1, 0);

}



static long __pmac generic_get_mb_info(struct device_node* node, long param, long value)

static long generic_get_mb_info(struct device_node* node, long param, long value)

{

	switch(param) {

		case PMAC_MB_INFO_MODEL:
@@ -347,14 +347,14 @@ static long __pmac generic_get_mb_info(struct device_node* node, long param, lon 


/* Used on any machine

 */

static struct feature_table_entry any_features[]  __pmacdata = {

static struct feature_table_entry any_features[] = {

	{ PMAC_FTR_GET_MB_INFO,		generic_get_mb_info },

	{ 0, NULL }

};



/* G5 features

 */

static struct feature_table_entry g5_features[]  __pmacdata = {

static struct feature_table_entry g5_features[] = {

	{ PMAC_FTR_GMAC_ENABLE,		g5_gmac_enable },

	{ PMAC_FTR_1394_ENABLE,		g5_fw_enable },

	{ PMAC_FTR_ENABLE_MPIC,		g5_mpic_enable },
@@ -368,7 +368,7 @@ static struct feature_table_entry g5_features[] __pmacdata = { 
	{ 0, NULL }

};



static struct pmac_mb_def pmac_mb_defs[] __pmacdata = {

static struct pmac_mb_def pmac_mb_defs[] = {

	{	"PowerMac7,2",			"PowerMac G5",

		PMAC_TYPE_POWERMAC_G5,		g5_features,

		0,
@@ -394,7 +394,7 @@ static struct pmac_mb_def pmac_mb_defs[] __pmacdata = { 
/*

 * The toplevel feature_call callback

 */

long __pmac pmac_do_feature_call(unsigned int selector, ...)

long pmac_do_feature_call(unsigned int selector, ...)

{

	struct device_node* node;

	long param, value;
@@ -706,8 +706,8 @@ void __init pmac_check_ht_link(void) 
 * Early video resume hook

 */



static void (*pmac_early_vresume_proc)(void *data) __pmacdata;

static void *pmac_early_vresume_data __pmacdata;

static void (*pmac_early_vresume_proc)(void *data);

static void *pmac_early_vresume_data;



void pmac_set_early_video_resume(void (*proc)(void *data), void *data)

{
@@ -725,11 +725,11 @@ EXPORT_SYMBOL(pmac_set_early_video_resume); 
 * AGP related suspend/resume code

 */



static struct pci_dev *pmac_agp_bridge __pmacdata;

static int (*pmac_agp_suspend)(struct pci_dev *bridge) __pmacdata;

static int (*pmac_agp_resume)(struct pci_dev *bridge) __pmacdata;

static struct pci_dev *pmac_agp_bridge;

static int (*pmac_agp_suspend)(struct pci_dev *bridge);

static int (*pmac_agp_resume)(struct pci_dev *bridge);



void __pmac pmac_register_agp_pm(struct pci_dev *bridge,

void pmac_register_agp_pm(struct pci_dev *bridge,

				 int (*suspend)(struct pci_dev *bridge),

				 int (*resume)(struct pci_dev *bridge))

{
@@ -746,7 +746,7 @@ void __pmac pmac_register_agp_pm(struct pci_dev *bridge, 
}

EXPORT_SYMBOL(pmac_register_agp_pm);



void __pmac pmac_suspend_agp_for_card(struct pci_dev *dev)

void pmac_suspend_agp_for_card(struct pci_dev *dev)

{

	if (pmac_agp_bridge == NULL || pmac_agp_suspend == NULL)

		return;
@@ -756,7 +756,7 @@ void __pmac pmac_suspend_agp_for_card(struct pci_dev *dev) 
}

EXPORT_SYMBOL(pmac_suspend_agp_for_card);



void __pmac pmac_resume_agp_for_card(struct pci_dev *dev)

void pmac_resume_agp_for_card(struct pci_dev *dev)

{

	if (pmac_agp_bridge == NULL || pmac_agp_resume == NULL)

		return;

arch/ppc64/kernel/pmac_nvram.c

+15 −15
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ extern int system_running; 
static int (*core99_write_bank)(int bank, u8* datas);

static int (*core99_erase_bank)(int bank);



static char *nvram_image __pmacdata;

static char *nvram_image;





static ssize_t __pmac core99_nvram_read(char *buf, size_t count, loff_t *index)

static ssize_t core99_nvram_read(char *buf, size_t count, loff_t *index)

{

	int i;
@@ -103,7 +103,7 @@ static ssize_t __pmac core99_nvram_read(char *buf, size_t count, loff_t *index) 
	return count;

}



static ssize_t __pmac core99_nvram_write(char *buf, size_t count, loff_t *index)

static ssize_t core99_nvram_write(char *buf, size_t count, loff_t *index)

{

	int i;
@@ -121,14 +121,14 @@ static ssize_t __pmac core99_nvram_write(char *buf, size_t count, loff_t *index) 
	return count;

}



static ssize_t __pmac core99_nvram_size(void)

static ssize_t core99_nvram_size(void)

{

	if (nvram_image == NULL)

		return -ENODEV;

	return NVRAM_SIZE;

}



static u8 __pmac chrp_checksum(struct chrp_header* hdr)

static u8 chrp_checksum(struct chrp_header* hdr)

{

	u8 *ptr;

	u16 sum = hdr->signature;
@@ -139,7 +139,7 @@ static u8 __pmac chrp_checksum(struct chrp_header* hdr) 
	return sum;

}



static u32 __pmac core99_calc_adler(u8 *buffer)

static u32 core99_calc_adler(u8 *buffer)

{

	int cnt;

	u32 low, high;
@@ -161,7 +161,7 @@ static u32 __pmac core99_calc_adler(u8 *buffer) 
	return (high << 16) | low;

}



static u32 __pmac core99_check(u8* datas)

static u32 core99_check(u8* datas)

{

	struct core99_header* hdr99 = (struct core99_header*)datas;
@@ -180,7 +180,7 @@ static u32 __pmac core99_check(u8* datas) 
	return hdr99->generation;

}



static int __pmac sm_erase_bank(int bank)

static int sm_erase_bank(int bank)

{

	int stat, i;

	unsigned long timeout;
@@ -212,7 +212,7 @@ static int __pmac sm_erase_bank(int bank) 
	return 0;

}



static int __pmac sm_write_bank(int bank, u8* datas)

static int sm_write_bank(int bank, u8* datas)

{

	int i, stat = 0;

	unsigned long timeout;
@@ -247,7 +247,7 @@ static int __pmac sm_write_bank(int bank, u8* datas) 
	return 0;

}



static int __pmac amd_erase_bank(int bank)

static int amd_erase_bank(int bank)

{

	int i, stat = 0;

	unsigned long timeout;
@@ -294,7 +294,7 @@ static int __pmac amd_erase_bank(int bank) 
	return 0;

}



static int __pmac amd_write_bank(int bank, u8* datas)

static int amd_write_bank(int bank, u8* datas)

{

	int i, stat = 0;

	unsigned long timeout;
@@ -341,7 +341,7 @@ static int __pmac amd_write_bank(int bank, u8* datas) 
}





static int __pmac core99_nvram_sync(void)

static int core99_nvram_sync(void)

{

	struct core99_header* hdr99;

	unsigned long flags;
@@ -431,7 +431,7 @@ int __init pmac_nvram_init(void) 
	return 0;

}



int __pmac pmac_get_partition(int partition)

int pmac_get_partition(int partition)

{

	struct nvram_partition *part;

	const char *name;
@@ -459,7 +459,7 @@ int __pmac pmac_get_partition(int partition) 
	return part->index;

}



u8 __pmac pmac_xpram_read(int xpaddr)

u8 pmac_xpram_read(int xpaddr)

{

	int offset = pmac_get_partition(pmac_nvram_XPRAM);

	loff_t index;
@@ -476,7 +476,7 @@ u8 __pmac pmac_xpram_read(int xpaddr) 
	return buf;

}



void __pmac pmac_xpram_write(int xpaddr, u8 data)

void pmac_xpram_write(int xpaddr, u8 data)

{

	int offset = pmac_get_partition(pmac_nvram_XPRAM);

	loff_t index;

arch/ppc64/kernel/pmac_pci.c

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void __init fixup_bus_range(struct device_node *bridge) 
	|(((unsigned long)(off)) & 0xFCUL) \

	|1UL)



static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose,

static unsigned long macrisc_cfg_access(struct pci_controller* hose,

					       u8 bus, u8 dev_fn, u8 offset)

{

	unsigned int caddr;
@@ -142,7 +142,7 @@ static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose, 
	return ((unsigned long)hose->cfg_data) + offset;

}



static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn,

static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn,

				      int offset, int len, u32 *val)

{

	struct pci_controller *hose;
@@ -173,7 +173,7 @@ static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn, 
	return PCIBIOS_SUCCESSFUL;

}



static int __pmac macrisc_write_config(struct pci_bus *bus, unsigned int devfn,

static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,

				       int offset, int len, u32 val)

{

	struct pci_controller *hose;
@@ -265,7 +265,7 @@ static int u3_ht_skip_device(struct pci_controller *hose, 
		+ (((unsigned long)bus) << 16) \

		+ 0x01000000UL)



static unsigned long __pmac u3_ht_cfg_access(struct pci_controller* hose,

static unsigned long u3_ht_cfg_access(struct pci_controller* hose,

					     u8 bus, u8 devfn, u8 offset)

{

	if (bus == hose->first_busno) {
@@ -277,7 +277,7 @@ static unsigned long __pmac u3_ht_cfg_access(struct pci_controller* hose, 
		return ((unsigned long)hose->cfg_data) + U3_HT_CFA1(bus, devfn, offset);

}



static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,

static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,

				    int offset, int len, u32 *val)

{

	struct pci_controller *hose;
@@ -327,7 +327,7 @@ static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, 
	return PCIBIOS_SUCCESSFUL;

}



static int __pmac u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,

static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,

				     int offset, int len, u32 val)

{

	struct pci_controller *hose;

arch/ppc64/kernel/pmac_setup.c

+5 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(smu_cmdbuf_abs); 


extern void udbg_init_scc(struct device_node *np);



static void __pmac pmac_show_cpuinfo(struct seq_file *m)

static void pmac_show_cpuinfo(struct seq_file *m)

{

	struct device_node *np;

	char *pp;
@@ -210,7 +210,7 @@ static int pmac_late_init(void) 
late_initcall(pmac_late_init);



/* can't be __init - can be called whenever a disk is first accessed */

void __pmac note_bootable_part(dev_t dev, int part, int goodness)

void note_bootable_part(dev_t dev, int part, int goodness)

{

	extern dev_t boot_dev;

	char *p;
@@ -231,7 +231,7 @@ void __pmac note_bootable_part(dev_t dev, int part, int goodness) 
	}

}



static void __pmac pmac_restart(char *cmd)

static void pmac_restart(char *cmd)

{

	switch(sys_ctrler) {

#ifdef CONFIG_ADB_PMU
@@ -250,7 +250,7 @@ static void __pmac pmac_restart(char *cmd) 
	}

}



static void __pmac pmac_power_off(void)

static void pmac_power_off(void)

{

	switch(sys_ctrler) {

#ifdef CONFIG_ADB_PMU
@@ -268,7 +268,7 @@ static void __pmac pmac_power_off(void) 
	}

}



static void __pmac pmac_halt(void)

static void pmac_halt(void)

{

	pmac_power_off();

}

arch/ppc64/kernel/pmac_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void __init smp_core99_setup_cpu(int cpu_nr) 
	}

}



struct smp_ops_t core99_smp_ops __pmacdata = {

struct smp_ops_t core99_smp_ops = {

	.message_pass	= smp_mpic_message_pass,

	.probe		= smp_core99_probe,

	.kick_cpu	= smp_core99_kick_cpu,