aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Sampson <mike@sambodata.com>2014-03-24 05:04:49 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-04-16 17:25:27 -0400
commit07002c05c31e5aee7d2a2e2af73b414c75f302c2 (patch)
treeaa1f5d32c27a3282884946cdc36faa19e51289e3
parent3bdaa382b294946a6b8661c3eb77e595940c8a61 (diff)
[media] sn9c102_hv7131r: fix style warnings flagged by checkpatch.pl
Signed-off-by: Mike Sampson <mike@sambodata.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/sn9c102/sn9c102_hv7131r.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/staging/media/sn9c102/sn9c102_hv7131r.c b/drivers/staging/media/sn9c102/sn9c102_hv7131r.c
index 26a91115b831..51b24e000e88 100644
--- a/drivers/staging/media/sn9c102/sn9c102_hv7131r.c
+++ b/drivers/staging/media/sn9c102/sn9c102_hv7131r.c
@@ -23,7 +23,7 @@
23#include "sn9c102_devtable.h" 23#include "sn9c102_devtable.h"
24 24
25 25
26static int hv7131r_init(struct sn9c102_device* cam) 26static int hv7131r_init(struct sn9c102_device *cam)
27{ 27{
28 int err = 0; 28 int err = 0;
29 29
@@ -137,8 +137,8 @@ static int hv7131r_init(struct sn9c102_device* cam)
137} 137}
138 138
139 139
140static int hv7131r_get_ctrl(struct sn9c102_device* cam, 140static int hv7131r_get_ctrl(struct sn9c102_device *cam,
141 struct v4l2_control* ctrl) 141 struct v4l2_control *ctrl)
142{ 142{
143 switch (ctrl->id) { 143 switch (ctrl->id) {
144 case V4L2_CID_GAIN: 144 case V4L2_CID_GAIN:
@@ -176,8 +176,8 @@ static int hv7131r_get_ctrl(struct sn9c102_device* cam,
176} 176}
177 177
178 178
179static int hv7131r_set_ctrl(struct sn9c102_device* cam, 179static int hv7131r_set_ctrl(struct sn9c102_device *cam,
180 const struct v4l2_control* ctrl) 180 const struct v4l2_control *ctrl)
181{ 181{
182 int err = 0; 182 int err = 0;
183 183
@@ -197,6 +197,7 @@ static int hv7131r_set_ctrl(struct sn9c102_device* cam,
197 case V4L2_CID_BLACK_LEVEL: 197 case V4L2_CID_BLACK_LEVEL:
198 { 198 {
199 int r = sn9c102_i2c_read(cam, 0x01); 199 int r = sn9c102_i2c_read(cam, 0x01);
200
200 if (r < 0) 201 if (r < 0)
201 return -EIO; 202 return -EIO;
202 err += sn9c102_i2c_write(cam, 0x01, 203 err += sn9c102_i2c_write(cam, 0x01,
@@ -211,10 +212,10 @@ static int hv7131r_set_ctrl(struct sn9c102_device* cam,
211} 212}
212 213
213 214
214static int hv7131r_set_crop(struct sn9c102_device* cam, 215static int hv7131r_set_crop(struct sn9c102_device *cam,
215 const struct v4l2_rect* rect) 216 const struct v4l2_rect *rect)
216{ 217{
217 struct sn9c102_sensor* s = sn9c102_get_sensor(cam); 218 struct sn9c102_sensor *s = sn9c102_get_sensor(cam);
218 int err = 0; 219 int err = 0;
219 u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1, 220 u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1,
220 v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1; 221 v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
@@ -226,8 +227,8 @@ static int hv7131r_set_crop(struct sn9c102_device* cam,
226} 227}
227 228
228 229
229static int hv7131r_set_pix_format(struct sn9c102_device* cam, 230static int hv7131r_set_pix_format(struct sn9c102_device *cam,
230 const struct v4l2_pix_format* pix) 231 const struct v4l2_pix_format *pix)
231{ 232{
232 int err = 0; 233 int err = 0;
233 234
@@ -347,7 +348,7 @@ static const struct sn9c102_sensor hv7131r = {
347}; 348};
348 349
349 350
350int sn9c102_probe_hv7131r(struct sn9c102_device* cam) 351int sn9c102_probe_hv7131r(struct sn9c102_device *cam)
351{ 352{
352 int devid, err; 353 int devid, err;
353 354