Commit 720c9133 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Paul Mackerras

[POWERPC] PS3: Checkpatch cleanups for arch/powerpc/platforms/ps3/repository.c

Cleanup coding errors in arch/powerpc/platforms/ps3/repository.c as
reported by sparse and checkpatch.
Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d0e5c218
...@@ -33,7 +33,7 @@ enum ps3_lpar_id { ...@@ -33,7 +33,7 @@ enum ps3_lpar_id {
}; };
#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__) #define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
static void _dump_field(const char *hdr, u64 n, const char* func, int line) static void _dump_field(const char *hdr, u64 n, const char *func, int line)
{ {
#if defined(DEBUG) #if defined(DEBUG)
char s[16]; char s[16];
...@@ -50,8 +50,8 @@ static void _dump_field(const char *hdr, u64 n, const char* func, int line) ...@@ -50,8 +50,8 @@ static void _dump_field(const char *hdr, u64 n, const char* func, int line)
#define dump_node_name(_a, _b, _c, _d, _e) \ #define dump_node_name(_a, _b, _c, _d, _e) \
_dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__) _dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3, static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
u64 n4, const char* func, int line) u64 n4, const char *func, int line)
{ {
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id); pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line); _dump_field("n1: ", n1, func, line);
...@@ -63,7 +63,7 @@ static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3, ...@@ -63,7 +63,7 @@ static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
#define dump_node(_a, _b, _c, _d, _e, _f, _g) \ #define dump_node(_a, _b, _c, _d, _e, _f, _g) \
_dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__) _dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4, static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
u64 v1, u64 v2, const char* func, int line) u64 v1, u64 v2, const char *func, int line)
{ {
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id); pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line); _dump_field("n1: ", n1, func, line);
...@@ -165,7 +165,7 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str, ...@@ -165,7 +165,7 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field(bus_str, 0), make_field(bus_str, 0),
0, 0, 0, 0,
value, 0); value, NULL);
} }
int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id) int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)
...@@ -190,7 +190,7 @@ int ps3_repository_read_bus_type(unsigned int bus_index, ...@@ -190,7 +190,7 @@ int ps3_repository_read_bus_type(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("type", 0), make_field("type", 0),
0, 0, 0, 0,
&v1, 0); &v1, NULL);
*bus_type = v1; *bus_type = v1;
return result; return result;
} }
...@@ -205,7 +205,7 @@ int ps3_repository_read_bus_num_dev(unsigned int bus_index, ...@@ -205,7 +205,7 @@ int ps3_repository_read_bus_num_dev(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("num_dev", 0), make_field("num_dev", 0),
0, 0, 0, 0,
&v1, 0); &v1, NULL);
*num_dev = v1; *num_dev = v1;
return result; return result;
} }
...@@ -218,7 +218,7 @@ int ps3_repository_read_dev_str(unsigned int bus_index, ...@@ -218,7 +218,7 @@ int ps3_repository_read_dev_str(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field(dev_str, 0), make_field(dev_str, 0),
0, 0,
value, 0); value, NULL);
} }
int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index, int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
...@@ -231,7 +231,7 @@ int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index, ...@@ -231,7 +231,7 @@ int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("id", 0), make_field("id", 0),
0, 0,
dev_id, 0); dev_id, NULL);
return result; return result;
} }
...@@ -246,14 +246,14 @@ int ps3_repository_read_dev_type(unsigned int bus_index, ...@@ -246,14 +246,14 @@ int ps3_repository_read_dev_type(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("type", 0), make_field("type", 0),
0, 0,
&v1, 0); &v1, NULL);
*dev_type = v1; *dev_type = v1;
return result; return result;
} }
int ps3_repository_read_dev_intr(unsigned int bus_index, int ps3_repository_read_dev_intr(unsigned int bus_index,
unsigned int dev_index, unsigned int intr_index, unsigned int dev_index, unsigned int intr_index,
enum ps3_interrupt_type *intr_type, unsigned int* interrupt_id) enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id)
{ {
int result; int result;
u64 v1; u64 v1;
...@@ -282,7 +282,7 @@ int ps3_repository_read_dev_reg_type(unsigned int bus_index, ...@@ -282,7 +282,7 @@ int ps3_repository_read_dev_reg_type(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("reg", reg_index), make_field("reg", reg_index),
make_field("type", 0), make_field("type", 0),
&v1, 0); &v1, NULL);
*reg_type = v1; *reg_type = v1;
return result; return result;
} }
...@@ -588,7 +588,7 @@ int ps3_repository_read_stor_dev_port(unsigned int bus_index, ...@@ -588,7 +588,7 @@ int ps3_repository_read_stor_dev_port(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("port", 0), make_field("port", 0),
0, port, 0); 0, port, NULL);
} }
int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index, int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
...@@ -598,7 +598,7 @@ int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index, ...@@ -598,7 +598,7 @@ int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("blk_size", 0), make_field("blk_size", 0),
0, blk_size, 0); 0, blk_size, NULL);
} }
int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index, int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
...@@ -608,7 +608,7 @@ int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index, ...@@ -608,7 +608,7 @@ int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("n_blocks", 0), make_field("n_blocks", 0),
0, num_blocks, 0); 0, num_blocks, NULL);
} }
int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index, int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
...@@ -621,7 +621,7 @@ int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index, ...@@ -621,7 +621,7 @@ int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
make_first_field("bus", bus_index), make_first_field("bus", bus_index),
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("n_regs", 0), make_field("n_regs", 0),
0, &v1, 0); 0, &v1, NULL);
*num_regions = v1; *num_regions = v1;
return result; return result;
} }
...@@ -638,7 +638,7 @@ int ps3_repository_read_stor_dev_region_id(unsigned int bus_index, ...@@ -638,7 +638,7 @@ int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("region", region_index), make_field("region", region_index),
make_field("id", 0), make_field("id", 0),
&v1, 0); &v1, NULL);
*region_id = v1; *region_id = v1;
return result; return result;
} }
...@@ -651,7 +651,7 @@ int ps3_repository_read_stor_dev_region_size(unsigned int bus_index, ...@@ -651,7 +651,7 @@ int ps3_repository_read_stor_dev_region_size(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("region", region_index), make_field("region", region_index),
make_field("size", 0), make_field("size", 0),
region_size, 0); region_size, NULL);
} }
int ps3_repository_read_stor_dev_region_start(unsigned int bus_index, int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
...@@ -662,7 +662,7 @@ int ps3_repository_read_stor_dev_region_start(unsigned int bus_index, ...@@ -662,7 +662,7 @@ int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
make_field("dev", dev_index), make_field("dev", dev_index),
make_field("region", region_index), make_field("region", region_index),
make_field("start", 0), make_field("start", 0),
region_start, 0); region_start, NULL);
} }
int ps3_repository_read_stor_dev_info(unsigned int bus_index, int ps3_repository_read_stor_dev_info(unsigned int bus_index,
...@@ -718,7 +718,7 @@ int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size) ...@@ -718,7 +718,7 @@ int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
make_field("pu", 0), make_field("pu", 0),
ppe_id, ppe_id,
make_field("rm_size", 0), make_field("rm_size", 0),
rm_size, 0); rm_size, NULL);
} }
int ps3_repository_read_region_total(u64 *region_total) int ps3_repository_read_region_total(u64 *region_total)
...@@ -727,7 +727,7 @@ int ps3_repository_read_region_total(u64 *region_total) ...@@ -727,7 +727,7 @@ int ps3_repository_read_region_total(u64 *region_total)
make_first_field("bi", 0), make_first_field("bi", 0),
make_field("rgntotal", 0), make_field("rgntotal", 0),
0, 0, 0, 0,
region_total, 0); region_total, NULL);
} }
/** /**
...@@ -763,7 +763,7 @@ int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved) ...@@ -763,7 +763,7 @@ int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
make_first_field("bi", 0), make_first_field("bi", 0),
make_field("spun", 0), make_field("spun", 0),
0, 0, 0, 0,
&v1, 0); &v1, NULL);
*num_spu_reserved = v1; *num_spu_reserved = v1;
return result; return result;
} }
...@@ -782,7 +782,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id) ...@@ -782,7 +782,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
make_first_field("bi", 0), make_first_field("bi", 0),
make_field("spursvn", 0), make_field("spursvn", 0),
0, 0, 0, 0,
&v1, 0); &v1, NULL);
*num_resource_id = v1; *num_resource_id = v1;
return result; return result;
} }
...@@ -795,7 +795,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id) ...@@ -795,7 +795,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
*/ */
int ps3_repository_read_spu_resource_id(unsigned int res_index, int ps3_repository_read_spu_resource_id(unsigned int res_index,
enum ps3_spu_resource_type* resource_type, unsigned int *resource_id) enum ps3_spu_resource_type *resource_type, unsigned int *resource_id)
{ {
int result; int result;
u64 v1; u64 v1;
...@@ -812,14 +812,14 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index, ...@@ -812,14 +812,14 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index,
return result; return result;
} }
int ps3_repository_read_boot_dat_address(u64 *address) static int ps3_repository_read_boot_dat_address(u64 *address)
{ {
return read_node(PS3_LPAR_ID_CURRENT, return read_node(PS3_LPAR_ID_CURRENT,
make_first_field("bi", 0), make_first_field("bi", 0),
make_field("boot_dat", 0), make_field("boot_dat", 0),
make_field("address", 0), make_field("address", 0),
0, 0,
address, 0); address, NULL);
} }
int ps3_repository_read_boot_dat_size(unsigned int *size) int ps3_repository_read_boot_dat_size(unsigned int *size)
...@@ -832,7 +832,7 @@ int ps3_repository_read_boot_dat_size(unsigned int *size) ...@@ -832,7 +832,7 @@ int ps3_repository_read_boot_dat_size(unsigned int *size)
make_field("boot_dat", 0), make_field("boot_dat", 0),
make_field("size", 0), make_field("size", 0),
0, 0,
&v1, 0); &v1, NULL);
*size = v1; *size = v1;
return result; return result;
} }
...@@ -847,7 +847,7 @@ int ps3_repository_read_vuart_av_port(unsigned int *port) ...@@ -847,7 +847,7 @@ int ps3_repository_read_vuart_av_port(unsigned int *port)
make_field("vir_uart", 0), make_field("vir_uart", 0),
make_field("port", 0), make_field("port", 0),
make_field("avset", 0), make_field("avset", 0),
&v1, 0); &v1, NULL);
*port = v1; *port = v1;
return result; return result;
} }
...@@ -862,7 +862,7 @@ int ps3_repository_read_vuart_sysmgr_port(unsigned int *port) ...@@ -862,7 +862,7 @@ int ps3_repository_read_vuart_sysmgr_port(unsigned int *port)
make_field("vir_uart", 0), make_field("vir_uart", 0),
make_field("port", 0), make_field("port", 0),
make_field("sysmgr", 0), make_field("sysmgr", 0),
&v1, 0); &v1, NULL);
*port = v1; *port = v1;
return result; return result;
} }
...@@ -893,7 +893,7 @@ int ps3_repository_read_num_be(unsigned int *num_be) ...@@ -893,7 +893,7 @@ int ps3_repository_read_num_be(unsigned int *num_be)
0, 0,
0, 0,
0, 0,
&v1, 0); &v1, NULL);
*num_be = v1; *num_be = v1;
return result; return result;
} }
...@@ -905,7 +905,7 @@ int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id) ...@@ -905,7 +905,7 @@ int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
0, 0,
0, 0,
0, 0,
node_id, 0); node_id, NULL);
} }
int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq) int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
...@@ -915,7 +915,7 @@ int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq) ...@@ -915,7 +915,7 @@ int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
node_id, node_id,
make_field("clock", 0), make_field("clock", 0),
0, 0,
tb_freq, 0); tb_freq, NULL);
} }
int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq) int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
......
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