mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
This reverts commit 9a5a6911aa as it
causes unneeded build warnings :(

Reported-by: Stephen 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2017-08-17 10:55:54 -07:00
parent fce042f02e
commit 09cbc5de15
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/media/atomisp/i2c/imx/imx.c
View file

@ -1084,7 +1084,7 @@ static int imx_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val)
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);
if (dev->vcm_driver && dev->vcm_driver->power_up)
@ -1092,7 +1092,7 @@ static int imx_vcm_power_up(struct v4l2_subdev *sd)
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);
if (dev->vcm_driver && dev->vcm_driver->power_down)
@ -1100,7 +1100,7 @@ static int imx_vcm_power_down(struct v4l2_subdev *sd)
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);
if (dev->vcm_driver && dev->vcm_driver->init)
@ -1108,7 +1108,7 @@ static int imx_vcm_init(struct v4l2_subdev *sd)
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);
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)
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);
if (dev->vcm_driver && dev->vcm_driver->t_focus_abs)
return dev->vcm_driver->t_focus_abs(sd, value);
return 0;
}
static int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value)
int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value)
{
struct imx_device *dev = to_imx_sensor(sd);
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)
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);
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)
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);
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)
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);
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)
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);
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)
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 imx_device *dev = to_imx_sensor(sd);