aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2007-01-26 22:07:47 -0500
committerPaul Mackerras <paulus@samba.org>2007-02-06 22:03:17 -0500
commiteebb81c13aa831a623e903bbae97a23fe9be93eb (patch)
tree5bd1fd1a3abebaf9d99fb028c42347f3918e7fde /include/asm-powerpc
parent25c4a46f0ed8ece9ac6699e200fcc83a4642dce7 (diff)
[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/asm-powerpc')
-rw-r--r--include/asm-powerpc/ps3.h16
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 {
277 PS3_INTERRUPT_TYPE_OTHER = 5, 277 PS3_INTERRUPT_TYPE_OTHER = 5,
278}; 278};
279 279
280enum ps3_region_type { 280enum ps3_reg_type {
281 PS3_REGION_TYPE_SB_OHCI = 3, 281 PS3_REG_TYPE_SB_OHCI = 3,
282 PS3_REGION_TYPE_SB_EHCI = 4, 282 PS3_REG_TYPE_SB_EHCI = 4,
283 PS3_REGION_TYPE_SB_GPIO = 5, 283 PS3_REG_TYPE_SB_GPIO = 5,
284}; 284};
285 285
286int ps3_repository_read_dev_str(unsigned int bus_index, 286int ps3_repository_read_dev_str(unsigned int bus_index,
@@ -294,13 +294,13 @@ int ps3_repository_read_dev_intr(unsigned int bus_index,
294 enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id); 294 enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id);
295int ps3_repository_read_dev_reg_type(unsigned int bus_index, 295int ps3_repository_read_dev_reg_type(unsigned int bus_index,
296 unsigned int dev_index, unsigned int reg_index, 296 unsigned int dev_index, unsigned int reg_index,
297 enum ps3_region_type *reg_type); 297 enum ps3_reg_type *reg_type);
298int ps3_repository_read_dev_reg_addr(unsigned int bus_index, 298int ps3_repository_read_dev_reg_addr(unsigned int bus_index,
299 unsigned int dev_index, unsigned int reg_index, u64 *bus_addr, 299 unsigned int dev_index, unsigned int reg_index, u64 *bus_addr,
300 u64 *len); 300 u64 *len);
301int ps3_repository_read_dev_reg(unsigned int bus_index, 301int ps3_repository_read_dev_reg(unsigned int bus_index,
302 unsigned int dev_index, unsigned int reg_index, 302 unsigned int dev_index, unsigned int reg_index,
303 enum ps3_region_type *reg_type, u64 *bus_addr, u64 *len); 303 enum ps3_reg_type *reg_type, u64 *bus_addr, u64 *len);
304 304
305/* repository bus enumerators */ 305/* repository bus enumerators */
306 306
@@ -322,8 +322,8 @@ static inline int ps3_repository_find_first_device(
322} 322}
323int ps3_repository_find_interrupt(const struct ps3_repository_device *dev, 323int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
324 enum ps3_interrupt_type intr_type, unsigned int *interrupt_id); 324 enum ps3_interrupt_type intr_type, unsigned int *interrupt_id);
325int ps3_repository_find_region(const struct ps3_repository_device *dev, 325int ps3_repository_find_reg(const struct ps3_repository_device *dev,
326 enum ps3_region_type reg_type, u64 *bus_addr, u64 *len); 326 enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len);
327 327
328/* repository block device info */ 328/* repository block device info */
329 329