tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

This reverts commit 9a5a6911aa3fb679f4640d5cf2346d095a7641f1 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>

Greg Kroah-Hartman 09cbc5de fce042f0

+12 -12
+12 -12
drivers/staging/media/atomisp/i2c/imx/imx.c
··· 1084 1084 return 0; 1085 1085 } 1086 1086 1087 - static int imx_vcm_power_up(struct v4l2_subdev *sd) 1087 + int imx_vcm_power_up(struct v4l2_subdev *sd) 1088 1088 { 1089 1089 struct imx_device *dev = to_imx_sensor(sd); 1090 1090 if (dev->vcm_driver && dev->vcm_driver->power_up) ··· 1092 1092 return 0; 1093 1093 } 1094 1094 1095 - static int imx_vcm_power_down(struct v4l2_subdev *sd) 1095 + int imx_vcm_power_down(struct v4l2_subdev *sd) 1096 1096 { 1097 1097 struct imx_device *dev = to_imx_sensor(sd); 1098 1098 if (dev->vcm_driver && dev->vcm_driver->power_down) ··· 1100 1100 return 0; 1101 1101 } 1102 1102 1103 - static int imx_vcm_init(struct v4l2_subdev *sd) 1103 + int imx_vcm_init(struct v4l2_subdev *sd) 1104 1104 { 1105 1105 struct imx_device *dev = to_imx_sensor(sd); 1106 1106 if (dev->vcm_driver && dev->vcm_driver->init) ··· 1108 1108 return 0; 1109 1109 } 1110 1110 1111 - static int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val) 1111 + int imx_t_focus_vcm(struct v4l2_subdev *sd, u16 val) 1112 1112 { 1113 1113 struct imx_device *dev = to_imx_sensor(sd); 1114 1114 if (dev->vcm_driver && dev->vcm_driver->t_focus_vcm) ··· 1116 1116 return 0; 1117 1117 } 1118 1118 1119 - static int imx_t_focus_abs(struct v4l2_subdev *sd, s32 value) 1119 + int imx_t_focus_abs(struct v4l2_subdev *sd, s32 value) 1120 1120 { 1121 1121 struct imx_device *dev = to_imx_sensor(sd); 1122 1122 if (dev->vcm_driver && dev->vcm_driver->t_focus_abs) 1123 1123 return dev->vcm_driver->t_focus_abs(sd, value); 1124 1124 return 0; 1125 1125 } 1126 - 1127 - static int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value) 1126 + int imx_t_focus_rel(struct v4l2_subdev *sd, s32 value) 1128 1127 { 1129 1128 struct imx_device *dev = to_imx_sensor(sd); 1130 1129 if (dev->vcm_driver && dev->vcm_driver->t_focus_rel) ··· 1131 1132 return 0; 1132 1133 } 1133 1134 1134 - static int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value) 1135 + int imx_q_focus_status(struct v4l2_subdev *sd, s32 *value) 1135 1136 { 1136 1137 struct imx_device *dev = to_imx_sensor(sd); 1137 1138 if (dev->vcm_driver && dev->vcm_driver->q_focus_status) ··· 1139 1140 return 0; 1140 1141 } 1141 1142 1142 - static int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value) 1143 + int imx_q_focus_abs(struct v4l2_subdev *sd, s32 *value) 1143 1144 { 1144 1145 struct imx_device *dev = to_imx_sensor(sd); 1145 1146 if (dev->vcm_driver && dev->vcm_driver->q_focus_abs) ··· 1147 1148 return 0; 1148 1149 } 1149 1150 1150 - static int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value) 1151 + int imx_t_vcm_slew(struct v4l2_subdev *sd, s32 value) 1151 1152 { 1152 1153 struct imx_device *dev = to_imx_sensor(sd); 1153 1154 if (dev->vcm_driver && dev->vcm_driver->t_vcm_slew) ··· 1155 1156 return 0; 1156 1157 } 1157 1158 1158 - static int imx_t_vcm_timing(struct v4l2_subdev *sd, s32 value) 1159 + int imx_t_vcm_timing(struct v4l2_subdev *sd, s32 value) 1159 1160 { 1160 1161 struct imx_device *dev = to_imx_sensor(sd); 1161 1162 if (dev->vcm_driver && dev->vcm_driver->t_vcm_timing) ··· 2105 2106 return 0; 2106 2107 } 2107 2108 2108 - static int imx_g_frame_interval(struct v4l2_subdev *sd, 2109 + int 2110 + imx_g_frame_interval(struct v4l2_subdev *sd, 2109 2111 struct v4l2_subdev_frame_interval *interval) 2110 2112 { 2111 2113 struct imx_device *dev = to_imx_sensor(sd);