Skip to content

L
linux-davinci
Commit aacaf9bd authored by Jon Loeliger's avatar Jon Loeliger Committed by Paul Mackerras
Browse files
Options

[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
Expand all Show whitespace changes
Inline Side-by-side
Showing with 203 additions and 206 deletions
arch/ppc64/kernel/pmac_feature.c
View file @ aacaf9bd
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
* We use a single global lock to protect accesses. Each driver has * We use a single global lock to protect accesses. Each driver has
* to take care of its own locking * 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 LOCK(flags) spin_lock_irqsave(&feature_lock, flags);
#define UNLOCK(flags) spin_unlock_irqrestore(&feature_lock, flags); #define UNLOCK(flags) spin_unlock_irqrestore(&feature_lock, flags);
...@@ -62,9 +62,9 @@ static DEFINE_SPINLOCK(feature_lock __pmacdata); ...@@ -62,9 +62,9 @@ static DEFINE_SPINLOCK(feature_lock __pmacdata);
/* /*
* Instance of some macio stuffs * 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) { while(child) {
int i; int i;
...@@ -79,7 +79,7 @@ struct macio_chip* __pmac macio_find(struct device_node* child, int type) ...@@ -79,7 +79,7 @@ struct macio_chip* __pmac macio_find(struct device_node* child, int type)
} }
EXPORT_SYMBOL_GPL(macio_find); EXPORT_SYMBOL_GPL(macio_find);
static const char* macio_names[] __pmacdata = static const char* macio_names[] =
{ {
"Unknown", "Unknown",
"Grand Central", "Grand Central",
...@@ -106,9 +106,9 @@ static const char* macio_names[] __pmacdata = ...@@ -106,9 +106,9 @@ static const char* macio_names[] __pmacdata =
#define UN_BIS(r,v) (UN_OUT((r), UN_IN(r) | (v))) #define UN_BIS(r,v) (UN_OUT((r), UN_IN(r) | (v)))
#define UN_BIC(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 struct device_node* uninorth_node;
static u32* uninorth_base __pmacdata; static u32* uninorth_base;
static u32 uninorth_rev __pmacdata; static u32 uninorth_rev;
static void *u3_ht; static void *u3_ht;
extern struct device_node *k2_skiplist[2]; extern struct device_node *k2_skiplist[2];
...@@ -133,14 +133,14 @@ struct pmac_mb_def ...@@ -133,14 +133,14 @@ struct pmac_mb_def
struct feature_table_entry* features; struct feature_table_entry* features;
unsigned long board_flags; 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 * 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]; 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 ...@@ -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]; 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 ...@@ -156,7 +156,7 @@ static long __pmac g5_write_gpio(struct device_node* node, long param, long valu
return 0; 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]; struct macio_chip* macio = &macio_chips[0];
unsigned long flags; unsigned long flags;
...@@ -181,7 +181,7 @@ static long __pmac g5_gmac_enable(struct device_node* node, long param, long val ...@@ -181,7 +181,7 @@ static long __pmac g5_gmac_enable(struct device_node* node, long param, long val
return 0; 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]; struct macio_chip* macio = &macio_chips[0];
unsigned long flags; unsigned long flags;
...@@ -206,7 +206,7 @@ static long __pmac g5_fw_enable(struct device_node* node, long param, long value ...@@ -206,7 +206,7 @@ static long __pmac g5_fw_enable(struct device_node* node, long param, long value
return 0; 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; unsigned long flags;
...@@ -220,7 +220,7 @@ static long __pmac g5_mpic_enable(struct device_node* node, long param, long val ...@@ -220,7 +220,7 @@ static long __pmac g5_mpic_enable(struct device_node* node, long param, long val
return 0; 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 macio_chip* macio = &macio_chips[0];
struct device_node *phy; struct device_node *phy;
...@@ -250,7 +250,7 @@ static long __pmac g5_eth_phy_reset(struct device_node* node, long param, long v ...@@ -250,7 +250,7 @@ static long __pmac g5_eth_phy_reset(struct device_node* node, long param, long v
return 0; 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 */ /* Very crude implementation for now */
struct macio_chip* macio = &macio_chips[0]; 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 ...@@ -275,7 +275,7 @@ static long __pmac g5_i2s_enable(struct device_node *node, long param, long valu
#ifdef CONFIG_SMP #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 int reset_io = 0;
unsigned long flags; unsigned long flags;
...@@ -320,12 +320,12 @@ static long __pmac g5_reset_cpu(struct device_node* node, long param, long value ...@@ -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 * This takes the second CPU off the bus on dual CPU machines
* running UP * running UP
*/ */
void __pmac g5_phy_disable_cpu1(void) void g5_phy_disable_cpu1(void)
{ {
UN_OUT(U3_API_PHY_CONFIG_1, 0); 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) { switch(param) {
case PMAC_MB_INFO_MODEL: case PMAC_MB_INFO_MODEL:
...@@ -347,14 +347,14 @@ static long __pmac generic_get_mb_info(struct device_node* node, long param, lon ...@@ -347,14 +347,14 @@ static long __pmac generic_get_mb_info(struct device_node* node, long param, lon
/* Used on any machine /* 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 }, { PMAC_FTR_GET_MB_INFO, generic_get_mb_info },
{ 0, NULL } { 0, NULL }
}; };
/* G5 features /* 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_GMAC_ENABLE, g5_gmac_enable },
{ PMAC_FTR_1394_ENABLE, g5_fw_enable }, { PMAC_FTR_1394_ENABLE, g5_fw_enable },
{ PMAC_FTR_ENABLE_MPIC, g5_mpic_enable }, { PMAC_FTR_ENABLE_MPIC, g5_mpic_enable },
...@@ -368,7 +368,7 @@ static struct feature_table_entry g5_features[] __pmacdata = { ...@@ -368,7 +368,7 @@ static struct feature_table_entry g5_features[] __pmacdata = {
{ 0, NULL } { 0, NULL }
}; };
static struct pmac_mb_def pmac_mb_defs[] __pmacdata = { static struct pmac_mb_def pmac_mb_defs[] = {
{ "PowerMac7,2", "PowerMac G5", { "PowerMac7,2", "PowerMac G5",
PMAC_TYPE_POWERMAC_G5, g5_features, PMAC_TYPE_POWERMAC_G5, g5_features,
0, 0,
...@@ -394,7 +394,7 @@ static struct pmac_mb_def pmac_mb_defs[] __pmacdata = { ...@@ -394,7 +394,7 @@ static struct pmac_mb_def pmac_mb_defs[] __pmacdata = {
/* /*
* The toplevel feature_call callback * 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; struct device_node* node;
long param, value; long param, value;
...@@ -706,8 +706,8 @@ void __init pmac_check_ht_link(void) ...@@ -706,8 +706,8 @@ void __init pmac_check_ht_link(void)
* Early video resume hook * Early video resume hook
*/ */
static void (*pmac_early_vresume_proc)(void *data) __pmacdata; static void (*pmac_early_vresume_proc)(void *data);
static void *pmac_early_vresume_data __pmacdata; static void *pmac_early_vresume_data;
void pmac_set_early_video_resume(void (*proc)(void *data), void *data) void pmac_set_early_video_resume(void (*proc)(void *data), void *data)
{ {
...@@ -725,11 +725,11 @@ EXPORT_SYMBOL(pmac_set_early_video_resume); ...@@ -725,11 +725,11 @@ EXPORT_SYMBOL(pmac_set_early_video_resume);
* AGP related suspend/resume code * AGP related suspend/resume code
*/ */
static struct pci_dev *pmac_agp_bridge __pmacdata; static struct pci_dev *pmac_agp_bridge;
static int (*pmac_agp_suspend)(struct pci_dev *bridge) __pmacdata; static int (*pmac_agp_suspend)(struct pci_dev *bridge);
static int (*pmac_agp_resume)(struct pci_dev *bridge) __pmacdata; 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 (*suspend)(struct pci_dev *bridge),
int (*resume)(struct pci_dev *bridge)) int (*resume)(struct pci_dev *bridge))
{ {
...@@ -746,7 +746,7 @@ void __pmac pmac_register_agp_pm(struct pci_dev *bridge, ...@@ -746,7 +746,7 @@ void __pmac pmac_register_agp_pm(struct pci_dev *bridge,
} }
EXPORT_SYMBOL(pmac_register_agp_pm); 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) if (pmac_agp_bridge == NULL || pmac_agp_suspend == NULL)
return; return;
...@@ -756,7 +756,7 @@ void __pmac pmac_suspend_agp_for_card(struct pci_dev *dev) ...@@ -756,7 +756,7 @@ void __pmac pmac_suspend_agp_for_card(struct pci_dev *dev)
} }
EXPORT_SYMBOL(pmac_suspend_agp_for_card); 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) if (pmac_agp_bridge == NULL || pmac_agp_resume == NULL)
return; return;
......
arch/ppc64/kernel/pmac_nvram.c
View file @ aacaf9bd
...@@ -82,10 +82,10 @@ extern int system_running; ...@@ -82,10 +82,10 @@ extern int system_running;
static int (*core99_write_bank)(int bank, u8* datas); static int (*core99_write_bank)(int bank, u8* datas);
static int (*core99_erase_bank)(int bank); 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; int i;
...@@ -103,7 +103,7 @@ static ssize_t __pmac core99_nvram_read(char *buf, size_t count, loff_t *index) ...@@ -103,7 +103,7 @@ static ssize_t __pmac core99_nvram_read(char *buf, size_t count, loff_t *index)
return count; 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; int i;
...@@ -121,14 +121,14 @@ static ssize_t __pmac core99_nvram_write(char *buf, size_t count, loff_t *index) ...@@ -121,14 +121,14 @@ static ssize_t __pmac core99_nvram_write(char *buf, size_t count, loff_t *index)
return count; return count;
} }
static ssize_t __pmac core99_nvram_size(void) static ssize_t core99_nvram_size(void)
{ {
if (nvram_image == NULL) if (nvram_image == NULL)
return -ENODEV; return -ENODEV;
return NVRAM_SIZE; return NVRAM_SIZE;
} }
static u8 __pmac chrp_checksum(struct chrp_header* hdr) static u8 chrp_checksum(struct chrp_header* hdr)
{ {
u8 *ptr; u8 *ptr;
u16 sum = hdr->signature; u16 sum = hdr->signature;
...@@ -139,7 +139,7 @@ static u8 __pmac chrp_checksum(struct chrp_header* hdr) ...@@ -139,7 +139,7 @@ static u8 __pmac chrp_checksum(struct chrp_header* hdr)
return sum; return sum;
} }
static u32 __pmac core99_calc_adler(u8 *buffer) static u32 core99_calc_adler(u8 *buffer)
{ {
int cnt; int cnt;
u32 low, high; u32 low, high;
...@@ -161,7 +161,7 @@ static u32 __pmac core99_calc_adler(u8 *buffer) ...@@ -161,7 +161,7 @@ static u32 __pmac core99_calc_adler(u8 *buffer)
return (high << 16) | low; 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; struct core99_header* hdr99 = (struct core99_header*)datas;
...@@ -180,7 +180,7 @@ static u32 __pmac core99_check(u8* datas) ...@@ -180,7 +180,7 @@ static u32 __pmac core99_check(u8* datas)
return hdr99->generation; return hdr99->generation;
} }
static int __pmac sm_erase_bank(int bank) static int sm_erase_bank(int bank)
{ {
int stat, i; int stat, i;
unsigned long timeout; unsigned long timeout;
...@@ -212,7 +212,7 @@ static int __pmac sm_erase_bank(int bank) ...@@ -212,7 +212,7 @@ static int __pmac sm_erase_bank(int bank)
return 0; 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; int i, stat = 0;
unsigned long timeout; unsigned long timeout;
...@@ -247,7 +247,7 @@ static int __pmac sm_write_bank(int bank, u8* datas) ...@@ -247,7 +247,7 @@ static int __pmac sm_write_bank(int bank, u8* datas)
return 0; return 0;
} }
static int __pmac amd_erase_bank(int bank) static int amd_erase_bank(int bank)
{ {
int i, stat = 0; int i, stat = 0;
unsigned long timeout; unsigned long timeout;
...@@ -294,7 +294,7 @@ static int __pmac amd_erase_bank(int bank) ...@@ -294,7 +294,7 @@ static int __pmac amd_erase_bank(int bank)
return 0; 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; int i, stat = 0;
unsigned long timeout; unsigned long timeout;
...@@ -341,7 +341,7 @@ static int __pmac amd_write_bank(int bank, u8* datas) ...@@ -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; struct core99_header* hdr99;
unsigned long flags; unsigned long flags;
...@@ -431,7 +431,7 @@ int __init pmac_nvram_init(void) ...@@ -431,7 +431,7 @@ int __init pmac_nvram_init(void)
return 0; return 0;
} }
int __pmac pmac_get_partition(int partition) int pmac_get_partition(int partition)
{ {
struct nvram_partition *part; struct nvram_partition *part;
const char *name; const char *name;
...@@ -459,7 +459,7 @@ int __pmac pmac_get_partition(int partition) ...@@ -459,7 +459,7 @@ int __pmac pmac_get_partition(int partition)
return part->index; return part->index;
} }
u8 __pmac pmac_xpram_read(int xpaddr) u8 pmac_xpram_read(int xpaddr)
{ {
int offset = pmac_get_partition(pmac_nvram_XPRAM); int offset = pmac_get_partition(pmac_nvram_XPRAM);
loff_t index; loff_t index;
...@@ -476,7 +476,7 @@ u8 __pmac pmac_xpram_read(int xpaddr) ...@@ -476,7 +476,7 @@ u8 __pmac pmac_xpram_read(int xpaddr)
return buf; 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); int offset = pmac_get_partition(pmac_nvram_XPRAM);
loff_t index; loff_t index;
......
arch/ppc64/kernel/pmac_pci.c
View file @ aacaf9bd
...@@ -121,7 +121,7 @@ static void __init fixup_bus_range(struct device_node *bridge) ...@@ -121,7 +121,7 @@ static void __init fixup_bus_range(struct device_node *bridge)
|(((unsigned long)(off)) & 0xFCUL) \ |(((unsigned long)(off)) & 0xFCUL) \
|1UL) |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) u8 bus, u8 dev_fn, u8 offset)
{ {
unsigned int caddr; unsigned int caddr;
...@@ -142,7 +142,7 @@ static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose, ...@@ -142,7 +142,7 @@ static unsigned long __pmac macrisc_cfg_access(struct pci_controller* hose,
return ((unsigned long)hose->cfg_data) + offset; 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) int offset, int len, u32 *val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
...@@ -173,7 +173,7 @@ static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -173,7 +173,7 @@ static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn,
return PCIBIOS_SUCCESSFUL; 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) int offset, int len, u32 val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
...@@ -265,7 +265,7 @@ static int u3_ht_skip_device(struct pci_controller *hose, ...@@ -265,7 +265,7 @@ static int u3_ht_skip_device(struct pci_controller *hose,
+ (((unsigned long)bus) << 16) \ + (((unsigned long)bus) << 16) \
+ 0x01000000UL) + 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) u8 bus, u8 devfn, u8 offset)
{ {
if (bus == hose->first_busno) { if (bus == hose->first_busno) {
...@@ -277,7 +277,7 @@ static unsigned long __pmac u3_ht_cfg_access(struct pci_controller* hose, ...@@ -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); 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) int offset, int len, u32 *val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
...@@ -327,7 +327,7 @@ static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -327,7 +327,7 @@ static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
return PCIBIOS_SUCCESSFUL; 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) int offset, int len, u32 val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
......
arch/ppc64/kernel/pmac_setup.c
View file @ aacaf9bd
...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(smu_cmdbuf_abs); ...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(smu_cmdbuf_abs);
extern void udbg_init_scc(struct device_node *np); 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; struct device_node *np;
char *pp; char *pp;
...@@ -210,7 +210,7 @@ static int pmac_late_init(void) ...@@ -210,7 +210,7 @@ static int pmac_late_init(void)
late_initcall(pmac_late_init); late_initcall(pmac_late_init);
/* can't be __init - can be called whenever a disk is first accessed */ /* 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; extern dev_t boot_dev;
char *p; char *p;
...@@ -231,7 +231,7 @@ void __pmac note_bootable_part(dev_t dev, int part, int goodness) ...@@ -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) { switch(sys_ctrler) {
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
...@@ -250,7 +250,7 @@ static void __pmac pmac_restart(char *cmd) ...@@ -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) { switch(sys_ctrler) {
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
...@@ -268,7 +268,7 @@ static void __pmac pmac_power_off(void) ...@@ -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(); pmac_power_off();
} }
......
arch/ppc64/kernel/pmac_smp.c
View file @ aacaf9bd
...@@ -310,7 +310,7 @@ static void __init smp_core99_setup_cpu(int cpu_nr) ...@@ -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, .message_pass = smp_mpic_message_pass,
.probe = smp_core99_probe, .probe = smp_core99_probe,
.kick_cpu = smp_core99_kick_cpu, .kick_cpu = smp_core99_kick_cpu,
......
arch/ppc64/kernel/pmac_time.c
View file @ aacaf9bd
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
extern struct timezone sys_tz; extern struct timezone sys_tz;
extern void to_tm(int tim, struct rtc_time * tm); extern void to_tm(int tim, struct rtc_time * tm);
void __pmac pmac_get_rtc_time(struct rtc_time *tm) void pmac_get_rtc_time(struct rtc_time *tm)
{ {
switch(sys_ctrler) { switch(sys_ctrler) {
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
...@@ -92,7 +92,7 @@ void __pmac pmac_get_rtc_time(struct rtc_time *tm) ...@@ -92,7 +92,7 @@ void __pmac pmac_get_rtc_time(struct rtc_time *tm)
} }
} }
int __pmac pmac_set_rtc_time(struct rtc_time *tm) int pmac_set_rtc_time(struct rtc_time *tm)
{ {
switch(sys_ctrler) { switch(sys_ctrler) {
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
......
drivers/ide/ppc/pmac.c
View file @ aacaf9bd
This diff is collapsed.
drivers/macintosh/ans-lcd.c
View file @ aacaf9bd
...@@ -27,7 +27,7 @@ static volatile unsigned char __iomem *anslcd_ptr; ...@@ -27,7 +27,7 @@ static volatile unsigned char __iomem *anslcd_ptr;
#undef DEBUG #undef DEBUG
static void __pmac static void
anslcd_write_byte_ctrl ( unsigned char c ) anslcd_write_byte_ctrl ( unsigned char c )
{ {
#ifdef DEBUG #ifdef DEBUG
...@@ -43,14 +43,14 @@ anslcd_write_byte_ctrl ( unsigned char c ) ...@@ -43,14 +43,14 @@ anslcd_write_byte_ctrl ( unsigned char c )
} }
} }
static void __pmac static void
anslcd_write_byte_data ( unsigned char c ) anslcd_write_byte_data ( unsigned char c )
{ {
out_8(anslcd_ptr + ANSLCD_DATA_IX, c); out_8(anslcd_ptr + ANSLCD_DATA_IX, c);
udelay(anslcd_short_delay); udelay(anslcd_short_delay);
} }
static ssize_t __pmac static ssize_t
anslcd_write( struct file * file, const char __user * buf, anslcd_write( struct file * file, const char __user * buf,
size_t count, loff_t *ppos ) size_t count, loff_t *ppos )
{ {
...@@ -73,7 +73,7 @@ anslcd_write( struct file * file, const char __user * buf, ...@@ -73,7 +73,7 @@ anslcd_write( struct file * file, const char __user * buf,
return p - buf; return p - buf;
} }
static int __pmac static int
anslcd_ioctl( struct inode * inode, struct file * file, anslcd_ioctl( struct inode * inode, struct file * file,
unsigned int cmd, unsigned long arg ) unsigned int cmd, unsigned long arg )
{ {
...@@ -115,7 +115,7 @@ anslcd_ioctl( struct inode * inode, struct file * file, ...@@ -115,7 +115,7 @@ anslcd_ioctl( struct inode * inode, struct file * file,
} }
} }
static int __pmac static int
anslcd_open( struct inode * inode, struct file * file ) anslcd_open( struct inode * inode, struct file * file )
{ {
return 0; return 0;
......
drivers/macintosh/mediabay.c
View file @ aacaf9bd
...@@ -167,19 +167,19 @@ enum { ...@@ -167,19 +167,19 @@ enum {
* Functions for polling content of media bay * Functions for polling content of media bay
*/ */
static u8 __pmac static u8
ohare_mb_content(struct media_bay_info *bay) ohare_mb_content(struct media_bay_info *bay)
{ {
return (MB_IN32(bay, OHARE_MBCR) >> 12) & 7; return (MB_IN32(bay, OHARE_MBCR) >> 12) & 7;
} }
static u8 __pmac static u8
heathrow_mb_content(struct media_bay_info *bay) heathrow_mb_content(struct media_bay_info *bay)
{ {
return (MB_IN32(bay, HEATHROW_MBCR) >> 12) & 7; return (MB_IN32(bay, HEATHROW_MBCR) >> 12) & 7;
} }
static u8 __pmac static u8
keylargo_mb_content(struct media_bay_info *bay) keylargo_mb_content(struct media_bay_info *bay)
{ {
int new_gpio; int new_gpio;
...@@ -205,7 +205,7 @@ keylargo_mb_content(struct media_bay_info *bay) ...@@ -205,7 +205,7 @@ keylargo_mb_content(struct media_bay_info *bay)
* into reset state as well * into reset state as well
*/ */
static void __pmac static void
ohare_mb_power(struct media_bay_info* bay, int on_off) ohare_mb_power(struct media_bay_info* bay, int on_off)
{ {
if (on_off) { if (on_off) {
...@@ -224,7 +224,7 @@ ohare_mb_power(struct media_bay_info* bay, int on_off) ...@@ -224,7 +224,7 @@ ohare_mb_power(struct media_bay_info* bay, int on_off)
MB_BIC(bay, OHARE_MBCR, 0x00000F00); MB_BIC(bay, OHARE_MBCR, 0x00000F00);
} }
static void __pmac static void
heathrow_mb_power(struct media_bay_info* bay, int on_off) heathrow_mb_power(struct media_bay_info* bay, int on_off)
{ {
if (on_off) { if (on_off) {
...@@ -243,7 +243,7 @@ heathrow_mb_power(struct media_bay_info* bay, int on_off) ...@@ -243,7 +243,7 @@ heathrow_mb_power(struct media_bay_info* bay, int on_off)
MB_BIC(bay, HEATHROW_MBCR, 0x00000F00); MB_BIC(bay, HEATHROW_MBCR, 0x00000F00);
} }
static void __pmac static void
keylargo_mb_power(struct media_bay_info* bay, int on_off) keylargo_mb_power(struct media_bay_info* bay, int on_off)
{ {
if (on_off) { if (on_off) {
...@@ -267,7 +267,7 @@ keylargo_mb_power(struct media_bay_info* bay, int on_off) ...@@ -267,7 +267,7 @@ keylargo_mb_power(struct media_bay_info* bay, int on_off)
* enable the related busses * enable the related busses
*/ */
static int __pmac static int
ohare_mb_setup_bus(struct media_bay_info* bay, u8 device_id) ohare_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
{ {
switch(device_id) { switch(device_id) {
...@@ -287,7 +287,7 @@ ohare_mb_setup_bus(struct media_bay_info* bay, u8 device_id) ...@@ -287,7 +287,7 @@ ohare_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
return -ENODEV; return -ENODEV;
} }
static int __pmac static int
heathrow_mb_setup_bus(struct media_bay_info* bay, u8 device_id) heathrow_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
{ {
switch(device_id) { switch(device_id) {
...@@ -307,7 +307,7 @@ heathrow_mb_setup_bus(struct media_bay_info* bay, u8 device_id) ...@@ -307,7 +307,7 @@ heathrow_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
return -ENODEV; return -ENODEV;
} }
static int __pmac static int
keylargo_mb_setup_bus(struct media_bay_info* bay, u8 device_id) keylargo_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
{ {
switch(device_id) { switch(device_id) {
...@@ -330,43 +330,43 @@ keylargo_mb_setup_bus(struct media_bay_info* bay, u8 device_id) ...@@ -330,43 +330,43 @@ keylargo_mb_setup_bus(struct media_bay_info* bay, u8 device_id)
* Functions for tweaking resets * Functions for tweaking resets
*/ */
static void __pmac static void
ohare_mb_un_reset(struct media_bay_info* bay) ohare_mb_un_reset(struct media_bay_info* bay)
{ {
MB_BIS(bay, OHARE_FCR, OH_BAY_RESET_N); MB_BIS(bay, OHARE_FCR, OH_BAY_RESET_N);
} }
static void __pmac keylargo_mb_init(struct media_bay_info *bay) static void keylargo_mb_init(struct media_bay_info *bay)
{ {
MB_BIS(bay, KEYLARGO_MBCR, KL_MBCR_MB0_ENABLE); MB_BIS(bay, KEYLARGO_MBCR, KL_MBCR_MB0_ENABLE);
} }
static void __pmac heathrow_mb_un_reset(struct media_bay_info* bay) static void heathrow_mb_un_reset(struct media_bay_info* bay)
{ {
MB_BIS(bay, HEATHROW_FCR, HRW_BAY_RESET_N); MB_BIS(bay, HEATHROW_FCR, HRW_BAY_RESET_N);
} }
static void __pmac keylargo_mb_un_reset(struct media_bay_info* bay) static void keylargo_mb_un_reset(struct media_bay_info* bay)
{ {
MB_BIS(bay, KEYLARGO_MBCR, KL_MBCR_MB0_DEV_RESET); MB_BIS(bay, KEYLARGO_MBCR, KL_MBCR_MB0_DEV_RESET);
} }
static void __pmac ohare_mb_un_reset_ide(struct media_bay_info* bay) static void ohare_mb_un_reset_ide(struct media_bay_info* bay)
{ {
MB_BIS(bay, OHARE_FCR, OH_IDE1_RESET_N); MB_BIS(bay, OHARE_FCR, OH_IDE1_RESET_N);
} }
static void __pmac heathrow_mb_un_reset_ide(struct media_bay_info* bay) static void heathrow_mb_un_reset_ide(struct media_bay_info* bay)
{ {
MB_BIS(bay, HEATHROW_FCR, HRW_IDE1_RESET_N); MB_BIS(bay, HEATHROW_FCR, HRW_IDE1_RESET_N);
} }
static void __pmac keylargo_mb_un_reset_ide(struct media_bay_info* bay) static void keylargo_mb_un_reset_ide(struct media_bay_info* bay)
{ {
MB_BIS(bay, KEYLARGO_FCR1, KL1_EIDE0_RESET_N); MB_BIS(bay, KEYLARGO_FCR1, KL1_EIDE0_RESET_N);
} }
static inline void __pmac set_mb_power(struct media_bay_info* bay, int onoff) static inline void set_mb_power(struct media_bay_info* bay, int onoff)
{ {
/* Power up up and assert the bay reset line */ /* Power up up and assert the bay reset line */
if (onoff) { if (onoff) {
...@@ -382,7 +382,7 @@ static inline void __pmac set_mb_power(struct media_bay_info* bay, int onoff) ...@@ -382,7 +382,7 @@ static inline void __pmac set_mb_power(struct media_bay_info* bay, int onoff)
bay->timer = msecs_to_jiffies(MB_POWER_DELAY); bay->timer = msecs_to_jiffies(MB_POWER_DELAY);
} }
static void __pmac poll_media_bay(struct media_bay_info* bay) static void poll_media_bay(struct media_bay_info* bay)
{ {
int id = bay->ops->content(bay); int id = bay->ops->content(bay);
...@@ -415,7 +415,7 @@ static void __pmac poll_media_bay(struct media_bay_info* bay) ...@@ -415,7 +415,7 @@ static void __pmac poll_media_bay(struct media_bay_info* bay)
} }
} }
int __pmac check_media_bay(struct device_node *which_bay, int what) int check_media_bay(struct device_node *which_bay, int what)
{ {
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE
int i; int i;
...@@ -432,7 +432,7 @@ int __pmac check_media_bay(struct device_node *which_bay, int what) ...@@ -432,7 +432,7 @@ int __pmac check_media_bay(struct device_node *which_bay, int what)
} }
EXPORT_SYMBOL(check_media_bay); EXPORT_SYMBOL(check_media_bay);
int __pmac check_media_bay_by_base(unsigned long base, int what) int check_media_bay_by_base(unsigned long base, int what)
{ {
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE
int i; int i;
...@@ -449,7 +449,7 @@ int __pmac check_media_bay_by_base(unsigned long base, int what) ...@@ -449,7 +449,7 @@ int __pmac check_media_bay_by_base(unsigned long base, int what)
return -ENODEV; return -ENODEV;
} }
int __pmac media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base,
int irq, int index) int irq, int index)
{ {
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE
...@@ -489,7 +489,7 @@ int __pmac media_bay_set_ide_infos(struct device_node* which_bay, unsigned long ...@@ -489,7 +489,7 @@ int __pmac media_bay_set_ide_infos(struct device_node* which_bay, unsigned long
return -ENODEV; return -ENODEV;
} }
static void __pmac media_bay_step(int i) static void media_bay_step(int i)
{ {
struct media_bay_info* bay = &media_bays[i]; struct media_bay_info* bay = &media_bays[i];
...@@ -619,7 +619,7 @@ static void __pmac media_bay_step(int i) ...@@ -619,7 +619,7 @@ static void __pmac media_bay_step(int i)
* with the IDE driver. It needs to be a thread because * with the IDE driver. It needs to be a thread because
* ide_register can't be called from interrupt context. * ide_register can't be called from interrupt context.
*/ */
static int __pmac media_bay_task(void *x) static int media_bay_task(void *x)
{ {
int i; int i;
...@@ -704,7 +704,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de ...@@ -704,7 +704,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de
} }
static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state) static int media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
{ {
struct media_bay_info *bay = macio_get_drvdata(mdev); struct media_bay_info *bay = macio_get_drvdata(mdev);
...@@ -719,7 +719,7 @@ static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state) ...@@ -719,7 +719,7 @@ static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
return 0; return 0;
} }
static int __pmac media_bay_resume(struct macio_dev *mdev) static int media_bay_resume(struct macio_dev *mdev)
{ {
struct media_bay_info *bay = macio_get_drvdata(mdev); struct media_bay_info *bay = macio_get_drvdata(mdev);
...@@ -760,7 +760,7 @@ static int __pmac media_bay_resume(struct macio_dev *mdev) ...@@ -760,7 +760,7 @@ static int __pmac media_bay_resume(struct macio_dev *mdev)
/* Definitions of "ops" structures. /* Definitions of "ops" structures.
*/ */
static struct mb_ops ohare_mb_ops __pmacdata = { static struct mb_ops ohare_mb_ops = {
.name = "Ohare", .name = "Ohare",
.content = ohare_mb_content, .content = ohare_mb_content,
.power = ohare_mb_power, .power = ohare_mb_power,
...@@ -769,7 +769,7 @@ static struct mb_ops ohare_mb_ops __pmacdata = { ...@@ -769,7 +769,7 @@ static struct mb_ops ohare_mb_ops __pmacdata = {
.un_reset_ide = ohare_mb_un_reset_ide, .un_reset_ide = ohare_mb_un_reset_ide,
}; };
static struct mb_ops heathrow_mb_ops __pmacdata = { static struct mb_ops heathrow_mb_ops = {
.name = "Heathrow", .name = "Heathrow",
.content = heathrow_mb_content, .content = heathrow_mb_content,
.power = heathrow_mb_power, .power = heathrow_mb_power,
...@@ -778,7 +778,7 @@ static struct mb_ops heathrow_mb_ops __pmacdata = { ...@@ -778,7 +778,7 @@ static struct mb_ops heathrow_mb_ops __pmacdata = {
.un_reset_ide = heathrow_mb_un_reset_ide, .un_reset_ide = heathrow_mb_un_reset_ide,
}; };
static struct mb_ops keylargo_mb_ops __pmacdata = { static struct mb_ops keylargo_mb_ops = {
.name = "KeyLargo", .name = "KeyLargo",
.init = keylargo_mb_init, .init = keylargo_mb_init,
.content = keylargo_mb_content, .content = keylargo_mb_content,
......
drivers/macintosh/via-cuda.c
View file @ aacaf9bd
...@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(cuda_lock); ...@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(cuda_lock);
#ifdef CONFIG_MAC #ifdef CONFIG_MAC
#define CUDA_IRQ IRQ_MAC_ADB #define CUDA_IRQ IRQ_MAC_ADB
#define __openfirmware
#define eieio() #define eieio()
#else #else
#define CUDA_IRQ vias->intrs[0].line #define CUDA_IRQ vias->intrs[0].line
......
drivers/macintosh/via-pmu.c
View file @ aacaf9bd
This diff is collapsed.
drivers/macintosh/via-pmu68k.c
View file @ aacaf9bd
...@@ -835,7 +835,7 @@ static struct pci_save { ...@@ -835,7 +835,7 @@ static struct pci_save {
} *pbook_pci_saves; } *pbook_pci_saves;
static int n_pbook_pci_saves; static int n_pbook_pci_saves;
static inline void __openfirmware static inline void
pbook_pci_save(void) pbook_pci_save(void)
{ {
int npci; int npci;
...@@ -863,7 +863,7 @@ pbook_pci_save(void) ...@@ -863,7 +863,7 @@ pbook_pci_save(void)
} }
} }
static inline void __openfirmware static inline void
pbook_pci_restore(void) pbook_pci_restore(void)
{ {
u16 cmd; u16 cmd;
...@@ -902,7 +902,7 @@ pbook_pci_restore(void) ...@@ -902,7 +902,7 @@ pbook_pci_restore(void)
#define IRQ_ENABLE ((unsigned int *)0xf3000024) #define IRQ_ENABLE ((unsigned int *)0xf3000024)
#define MEM_CTRL ((unsigned int *)0xf8000070) #define MEM_CTRL ((unsigned int *)0xf8000070)
int __openfirmware powerbook_sleep(void) int powerbook_sleep(void)
{ {
int ret, i, x; int ret, i, x;
static int save_backlight; static int save_backlight;
...@@ -1001,25 +1001,24 @@ int __openfirmware powerbook_sleep(void) ...@@ -1001,25 +1001,24 @@ int __openfirmware powerbook_sleep(void)
/* /*
* Support for /dev/pmu device * Support for /dev/pmu device
*/ */
static int __openfirmware pmu_open(struct inode *inode, struct file *file) static int pmu_open(struct inode *inode, struct file *file)
{ {
return 0; return 0;
} }
static ssize_t __openfirmware pmu_read(struct file *file, char *buf, static ssize_t pmu_read(struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
return 0; return 0;
} }
static ssize_t __openfirmware pmu_write(struct file *file, const char *buf, static ssize_t pmu_write(struct file *file, const char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
return 0; return 0;
} }
/* Note: removed __openfirmware here since it causes link errors */ static int pmu_ioctl(struct inode * inode, struct file *filp,
static int /*__openfirmware*/ pmu_ioctl(struct inode * inode, struct file *filp,
u_int cmd, u_long arg) u_int cmd, u_long arg)
{ {
int error; int error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment