summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-02-12 04:02:06 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-11 08:56:26 -0400
commitd1166b0f178d8dce66714288e25af1d4d6c6f2d3 (patch)
treeb1a36cc67fc95f04a4b8050ab7d4fba4561f40d0 /drivers/media/i2c
parentbc46263b84782439925e9f3fe4d545ae830869a4 (diff)
[media] lm3560: keep style for the comments
Let's keep the style for all comments in the code, namely using small letters whenever it's possible. There is no functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/lm3560.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
index fea37a35027a..93e52270c9cc 100644
--- a/drivers/media/i2c/lm3560.c
+++ b/drivers/media/i2c/lm3560.c
@@ -36,7 +36,7 @@
36#define REG_FLAG 0xd0 36#define REG_FLAG 0xd0
37#define REG_CONFIG1 0xe0 37#define REG_CONFIG1 0xe0
38 38
39/* Fault Mask */ 39/* fault mask */
40#define FAULT_TIMEOUT (1<<0) 40#define FAULT_TIMEOUT (1<<0)
41#define FAULT_OVERTEMP (1<<1) 41#define FAULT_OVERTEMP (1<<1)
42#define FAULT_SHORT_CIRCUIT (1<<2) 42#define FAULT_SHORT_CIRCUIT (1<<2)
@@ -47,7 +47,8 @@ enum led_enable {
47 MODE_FLASH = 0x3, 47 MODE_FLASH = 0x3,
48}; 48};
49 49
50/* struct lm3560_flash 50/**
51 * struct lm3560_flash
51 * 52 *
52 * @pdata: platform data 53 * @pdata: platform data
53 * @regmap: reg. map for i2c 54 * @regmap: reg. map for i2c
@@ -92,7 +93,7 @@ static int lm3560_mode_ctrl(struct lm3560_flash *flash)
92 return rval; 93 return rval;
93} 94}
94 95
95/* led1/2 enable/disable */ 96/* led1/2 enable/disable */
96static int lm3560_enable_ctrl(struct lm3560_flash *flash, 97static int lm3560_enable_ctrl(struct lm3560_flash *flash,
97 enum lm3560_led_id led_no, bool on) 98 enum lm3560_led_id led_no, bool on)
98{ 99{
@@ -162,7 +163,7 @@ static int lm3560_flash_brt_ctrl(struct lm3560_flash *flash,
162 return rval; 163 return rval;
163} 164}
164 165
165/* V4L2 controls */ 166/* v4l2 controls */
166static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) 167static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
167{ 168{
168 struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no); 169 struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no);
@@ -291,6 +292,7 @@ static int lm3560_init_controls(struct lm3560_flash *flash,
291 const struct v4l2_ctrl_ops *ops = &lm3560_led_ctrl_ops[led_no]; 292 const struct v4l2_ctrl_ops *ops = &lm3560_led_ctrl_ops[led_no];
292 293
293 v4l2_ctrl_handler_init(hdl, 8); 294 v4l2_ctrl_handler_init(hdl, 8);
295
294 /* flash mode */ 296 /* flash mode */
295 v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_FLASH_LED_MODE, 297 v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_FLASH_LED_MODE,
296 V4L2_FLASH_LED_MODE_TORCH, ~0x7, 298 V4L2_FLASH_LED_MODE_TORCH, ~0x7,
@@ -303,6 +305,7 @@ static int lm3560_init_controls(struct lm3560_flash *flash,
303 305
304 /* flash strobe */ 306 /* flash strobe */
305 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE, 0, 0, 0, 0); 307 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE, 0, 0, 0, 0);
308
306 /* flash strobe stop */ 309 /* flash strobe stop */
307 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE_STOP, 0, 0, 0, 0); 310 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE_STOP, 0, 0, 0, 0);
308 311
@@ -389,7 +392,7 @@ static int lm3560_init_device(struct lm3560_flash *flash)
389 rval = lm3560_mode_ctrl(flash); 392 rval = lm3560_mode_ctrl(flash);
390 if (rval < 0) 393 if (rval < 0)
391 return rval; 394 return rval;
392 /* Reset faults */ 395 /* reset faults */
393 rval = regmap_read(flash->regmap, REG_FLAG, &reg_val); 396 rval = regmap_read(flash->regmap, REG_FLAG, &reg_val);
394 return rval; 397 return rval;
395} 398}