diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-01-27 06:07:47 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 06:03:17 +0300 |
| commit | eebb81c13aa831a623e903bbae97a23fe9be93eb (patch) | |
| tree | 5bd1fd1a3abebaf9d99fb028c42347f3918e7fde /include | |
| parent | 25c4a46f0ed8ece9ac6699e200fcc83a4642dce7 (diff) | |
| download | linux-eebb81c13aa831a623e903bbae97a23fe9be93eb.tar.xz | |
[POWERPC] ps3: repository misc fixes
Various fixes for the PS3 repository code:
- Sync signatures of function prototypes and implementations (enum vs.
unsigned int)
- Correct references to `regions' as `registers':
o Correct enum ps3_region_type as enum ps3_reg_type,
o Correct PS3_REGION_TYPE_* as PS3_REG_TYPE_*,
o Correct ps3_repository_find_region() as ps3_repository_find_reg().
- Correct function name in pr_debug() call
- Minor error condition improvements.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/ps3.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h index 52a69ed0d90a..b56aca28b26d 100644 --- a/include/asm-powerpc/ps3.h +++ b/include/asm-powerpc/ps3.h @@ -277,10 +277,10 @@ enum ps3_interrupt_type { PS3_INTERRUPT_TYPE_OTHER = 5, }; -enum ps3_region_type { - PS3_REGION_TYPE_SB_OHCI = 3, - PS3_REGION_TYPE_SB_EHCI = 4, - PS3_REGION_TYPE_SB_GPIO = 5, +enum ps3_reg_type { + PS3_REG_TYPE_SB_OHCI = 3, + PS3_REG_TYPE_SB_EHCI = 4, + PS3_REG_TYPE_SB_GPIO = 5, }; int ps3_repository_read_dev_str(unsigned int bus_index, @@ -294,13 +294,13 @@ int ps3_repository_read_dev_intr(unsigned int bus_index, enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id); int ps3_repository_read_dev_reg_type(unsigned int bus_index, unsigned int dev_index, unsigned int reg_index, - enum ps3_region_type *reg_type); + enum ps3_reg_type *reg_type); int ps3_repository_read_dev_reg_addr(unsigned int bus_index, unsigned int dev_index, unsigned int reg_index, u64 *bus_addr, u64 *len); int ps3_repository_read_dev_reg(unsigned int bus_index, unsigned int dev_index, unsigned int reg_index, - enum ps3_region_type *reg_type, u64 *bus_addr, u64 *len); + enum ps3_reg_type *reg_type, u64 *bus_addr, u64 *len); /* repository bus enumerators */ @@ -322,8 +322,8 @@ static inline int ps3_repository_find_first_device( } int ps3_repository_find_interrupt(const struct ps3_repository_device *dev, enum ps3_interrupt_type intr_type, unsigned int *interrupt_id); -int ps3_repository_find_region(const struct ps3_repository_device *dev, - enum ps3_region_type reg_type, u64 *bus_addr, u64 *len); +int ps3_repository_find_reg(const struct ps3_repository_device *dev, + enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len); /* repository block device info */ |