Commit 13a21ad1 authored by Jochen Maes's avatar Jochen Maes Committed by Greg Kroah-Hartman

staging: dream: more Code style fixes

Removed parenthesis from return statements,
split up assignment and if condition
Signed-off-by: default avatarJochen Maes <jochen.maes@sejo.be>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 451ff373
...@@ -743,12 +743,14 @@ static int s5k3e2fx_sensor_open_init(const struct msm_camera_sensor_info *data) ...@@ -743,12 +743,14 @@ static int s5k3e2fx_sensor_open_init(const struct msm_camera_sensor_info *data)
} }
/* initialize AF */ /* initialize AF */
if ((rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr,
0x3146, 0x3A)) < 0) 0x3146, 0x3A)
if (rc < 0)
goto init_fail1; goto init_fail1;
if ((rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr, rc = s5k3e2fx_i2c_write_b(s5k3e2fx_client->addr,
0x3130, 0x03)) < 0) 0x3130, 0x03)
if (rc < 0)
goto init_fail1; goto init_fail1;
goto init_done; goto init_done;
...@@ -814,20 +816,20 @@ static uint16_t s5k3e2fx_get_prev_lines_pf(void) ...@@ -814,20 +816,20 @@ static uint16_t s5k3e2fx_get_prev_lines_pf(void)
static uint16_t s5k3e2fx_get_prev_pixels_pl(void) static uint16_t s5k3e2fx_get_prev_pixels_pl(void)
{ {
return (s5k3e2fx_reg_pat[S_RES_PREVIEW].size_w + return s5k3e2fx_reg_pat[S_RES_PREVIEW].size_w +
s5k3e2fx_reg_pat[S_RES_PREVIEW].blk_p); s5k3e2fx_reg_pat[S_RES_PREVIEW].blk_p;
} }
static uint16_t s5k3e2fx_get_pict_lines_pf(void) static uint16_t s5k3e2fx_get_pict_lines_pf(void)
{ {
return (s5k3e2fx_reg_pat[S_RES_CAPTURE].size_h + return s5k3e2fx_reg_pat[S_RES_CAPTURE].size_h +
s5k3e2fx_reg_pat[S_RES_CAPTURE].blk_l); s5k3e2fx_reg_pat[S_RES_CAPTURE].blk_l;
} }
static uint16_t s5k3e2fx_get_pict_pixels_pl(void) static uint16_t s5k3e2fx_get_pict_pixels_pl(void)
{ {
return (s5k3e2fx_reg_pat[S_RES_CAPTURE].size_w + return s5k3e2fx_reg_pat[S_RES_CAPTURE].size_w +
s5k3e2fx_reg_pat[S_RES_CAPTURE].blk_p); s5k3e2fx_reg_pat[S_RES_CAPTURE].blk_p;
} }
static uint32_t s5k3e2fx_get_pict_max_exp_lc(void) static uint32_t s5k3e2fx_get_pict_max_exp_lc(void)
......
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