Commit 09cbc5de authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "staging: imx: fix non-static declarations"

This reverts commit 9a5a6911 as it
causes unneeded build warnings :(
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: JB Van Puyvelde <jbvanpuyvelde@gmail.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fce042f0
...@@ -1084,7 +1084,7 @@ static int imx_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val) ...@@ -1084,7 +1084,7 @@ static int imx_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val)
return 0; return 0;
} }
static int imx_vcm_power_up(struct v4l2_subdev *sd) int imx_vcm_power_up(struct v4l2_subdev *sd)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->power_up) if (dev->vcm_driver && dev->vcm_driver->power_up)
...@@ -1092,7 +1092,7 @@ static int imx_vcm_power_up(struct v4l2_subdev *sd) ...@@ -1092,7 +1092,7 @@ static int imx_vcm_power_up(struct v4l2_subdev *sd)
return 0; return 0;
} }
static int imx_vcm_power_down(struct v4l2_subdev *sd) int imx_vcm_power_down(struct v4l2_subdev *sd)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->power_down) if (dev->vcm_driver && dev->vcm_driver->power_down)
...@@ -1100,7 +1100,7 @@ static int imx_vcm_power_down(struct v4l2_subdev *sd) ...@@ -1100,7 +1100,7 @@ static int imx_vcm_power_down(struct v4l2_subdev *sd)
return 0; return 0;
} }
static int imx_vcm_init(struct v4l2_subdev *sd) int imx_vcm_init(struct v4l2_subdev *sd)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->init) if (dev->vcm_driver && dev->vcm_driver->init)
...@@ -1108,7 +1108,7 @@ static int imx_vcm_init(struct v4l2_subdev *sd) ...@@ -1108,7 +1108,7 @@ static int imx_vcm_init(struct v4l2_subdev *sd)
return 0; return 0;
} }
static int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val) int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->t_focus_vcm) if (dev->vcm_driver && dev->vcm_driver->t_focus_vcm)
...@@ -1116,15 +1116,14 @@ static int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val) ...@@ -1116,15 +1116,14 @@ static int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val)
return 0; return 0;
} }
static int imx_t_focus_abs(struct v4l2_subdev *sd, s32 value) int imx_t_focus_abs(struct v4l2_subdev *sd, s32 value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->t_focus_abs) if (dev->vcm_driver && dev->vcm_driver->t_focus_abs)
return dev->vcm_driver->t_focus_abs(sd, value); return dev->vcm_driver->t_focus_abs(sd, value);
return 0; return 0;
} }
int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value)
static int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->t_focus_rel) if (dev->vcm_driver && dev->vcm_driver->t_focus_rel)
...@@ -1132,7 +1131,7 @@ static int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value) ...@@ -1132,7 +1131,7 @@ static int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value)
return 0; return 0;
} }
static int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value) int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->q_focus_status) if (dev->vcm_driver && dev->vcm_driver->q_focus_status)
...@@ -1140,7 +1139,7 @@ static int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value) ...@@ -1140,7 +1139,7 @@ static int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value)
return 0; return 0;
} }
static int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value) int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->q_focus_abs) if (dev->vcm_driver && dev->vcm_driver->q_focus_abs)
...@@ -1148,7 +1147,7 @@ static int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value) ...@@ -1148,7 +1147,7 @@ static int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value)
return 0; return 0;
} }
static int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value) int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->t_vcm_slew) if (dev->vcm_driver && dev->vcm_driver->t_vcm_slew)
...@@ -1156,7 +1155,7 @@ static int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value) ...@@ -1156,7 +1155,7 @@ static int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value)
return 0; return 0;
} }
static int imx_t_vcm_timing(struct v4l2_subdev *sd, s32 value) int imx_t_vcm_timing(struct v4l2_subdev *sd, s32 value)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
if (dev->vcm_driver && dev->vcm_driver->t_vcm_timing) if (dev->vcm_driver && dev->vcm_driver->t_vcm_timing)
...@@ -2106,7 +2105,8 @@ imx_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *param) ...@@ -2106,7 +2105,8 @@ imx_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *param)
return 0; return 0;
} }
static int imx_g_frame_interval(struct v4l2_subdev *sd, int
imx_g_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_frame_interval *interval) struct v4l2_subdev_frame_interval *interval)
{ {
struct imx_device *dev = to_imx_sensor(sd); struct imx_device *dev = to_imx_sensor(sd);
......
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