Commit 7f2462ac authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michael Ellerman

powerpc: Squash lines for simple wrapper functions

Remove unneeded variables and assignments.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6deb6b47
...@@ -1594,11 +1594,8 @@ static int ppr_get(struct task_struct *target, ...@@ -1594,11 +1594,8 @@ static int ppr_get(struct task_struct *target,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf) void *kbuf, void __user *ubuf)
{ {
int ret; return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.ppr, 0, sizeof(u64));
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.ppr, 0, sizeof(u64));
return ret;
} }
static int ppr_set(struct task_struct *target, static int ppr_set(struct task_struct *target,
...@@ -1606,11 +1603,8 @@ static int ppr_set(struct task_struct *target, ...@@ -1606,11 +1603,8 @@ static int ppr_set(struct task_struct *target,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf) const void *kbuf, const void __user *ubuf)
{ {
int ret; return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.ppr, 0, sizeof(u64));
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.ppr, 0, sizeof(u64));
return ret;
} }
static int dscr_get(struct task_struct *target, static int dscr_get(struct task_struct *target,
...@@ -1618,22 +1612,16 @@ static int dscr_get(struct task_struct *target, ...@@ -1618,22 +1612,16 @@ static int dscr_get(struct task_struct *target,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf) void *kbuf, void __user *ubuf)
{ {
int ret; return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.dscr, 0, sizeof(u64));
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.dscr, 0, sizeof(u64));
return ret;
} }
static int dscr_set(struct task_struct *target, static int dscr_set(struct task_struct *target,
const struct user_regset *regset, const struct user_regset *regset,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf) const void *kbuf, const void __user *ubuf)
{ {
int ret; return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.dscr, 0, sizeof(u64));
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.dscr, 0, sizeof(u64));
return ret;
} }
#endif #endif
#ifdef CONFIG_PPC_BOOK3S_64 #ifdef CONFIG_PPC_BOOK3S_64
...@@ -1642,22 +1630,16 @@ static int tar_get(struct task_struct *target, ...@@ -1642,22 +1630,16 @@ static int tar_get(struct task_struct *target,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf) void *kbuf, void __user *ubuf)
{ {
int ret; return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.tar, 0, sizeof(u64));
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.tar, 0, sizeof(u64));
return ret;
} }
static int tar_set(struct task_struct *target, static int tar_set(struct task_struct *target,
const struct user_regset *regset, const struct user_regset *regset,
unsigned int pos, unsigned int count, unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf) const void *kbuf, const void __user *ubuf)
{ {
int ret; return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.tar, 0, sizeof(u64));
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.tar, 0, sizeof(u64));
return ret;
} }
static int ebb_active(struct task_struct *target, static int ebb_active(struct task_struct *target,
......
...@@ -170,14 +170,8 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str, ...@@ -170,14 +170,8 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
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)
{ {
int result; return read_node(PS3_LPAR_ID_PME, make_first_field("bus", bus_index),
make_field("id", 0), 0, 0, bus_id, NULL);
result = read_node(PS3_LPAR_ID_PME,
make_first_field("bus", bus_index),
make_field("id", 0),
0, 0,
bus_id, NULL);
return result;
} }
int ps3_repository_read_bus_type(unsigned int bus_index, int ps3_repository_read_bus_type(unsigned int bus_index,
...@@ -224,15 +218,9 @@ int ps3_repository_read_dev_str(unsigned int bus_index, ...@@ -224,15 +218,9 @@ int ps3_repository_read_dev_str(unsigned int bus_index,
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,
u64 *dev_id) u64 *dev_id)
{ {
int result; return read_node(PS3_LPAR_ID_PME, make_first_field("bus", bus_index),
make_field("dev", dev_index), make_field("id", 0), 0,
result = read_node(PS3_LPAR_ID_PME, dev_id, NULL);
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("id", 0),
0,
dev_id, NULL);
return result;
} }
int ps3_repository_read_dev_type(unsigned int bus_index, int ps3_repository_read_dev_type(unsigned int bus_index,
......
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