From e17a17a0306db76ad487667b41e35be12bbf85e9 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Sat, 4 Mar 2017 22:45:35 +0530 Subject: staging: media: atomisp: Fix block comments warning. Used kernel preferred block commenting style, to fix the following checkpatch issue: WARNING: Block comments use a trailing */ on a separate line Signed-off-by: Varsha Rao Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/atomisp/i2c/gc0310.c | 3 ++- drivers/staging/media/atomisp/i2c/gc2235.c | 3 ++- drivers/staging/media/atomisp/i2c/ov2680.c | 7 ++++--- drivers/staging/media/atomisp/i2c/ov2722.c | 6 ++++-- .../pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc0310.c b/drivers/staging/media/atomisp/i2c/gc0310.c index 2438dd0..2a6d8a6 100644 --- a/drivers/staging/media/atomisp/i2c/gc0310.c +++ b/drivers/staging/media/atomisp/i2c/gc0310.c @@ -538,7 +538,8 @@ static long gc0310_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) } /* This returns the exposure time being used. This should only be used - for filling in EXIF data, not for actual image processing. */ + * for filling in EXIF data, not for actual image processing. + */ static int gc0310_q_exposure(struct v4l2_subdev *sd, s32 *value) { struct i2c_client *client = v4l2_get_subdevdata(sd); diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 9bb30c1..2f6a341 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -427,7 +427,8 @@ static long gc2235_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) return 0; } /* This returns the exposure time being used. This should only be used - for filling in EXIF data, not for actual image processing. */ + * for filling in EXIF data, not for actual image processing. + */ static int gc2235_q_exposure(struct v4l2_subdev *sd, s32 *value) { struct i2c_client *client = v4l2_get_subdevdata(sd); diff --git a/drivers/staging/media/atomisp/i2c/ov2680.c b/drivers/staging/media/atomisp/i2c/ov2680.c index 5730fe5..df1e336 100644 --- a/drivers/staging/media/atomisp/i2c/ov2680.c +++ b/drivers/staging/media/atomisp/i2c/ov2680.c @@ -554,7 +554,8 @@ static long ov2680_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) } /* This returns the exposure time being used. This should only be used - for filling in EXIF data, not for actual image processing. */ + * for filling in EXIF data, not for actual image processing. + */ static int ov2680_q_exposure(struct v4l2_subdev *sd, s32 *value) { struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -1135,8 +1136,8 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, v4l2_info(client, "\n%s idx %d \n", __func__, dev->fmt_idx); /*ret = startup(sd); - if (ret) - dev_err(&client->dev, "ov2680 startup err\n"); + * if (ret) + * dev_err(&client->dev, "ov2680 startup err\n"); */ err: mutex_unlock(&dev->input_lock); diff --git a/drivers/staging/media/atomisp/i2c/ov2722.c b/drivers/staging/media/atomisp/i2c/ov2722.c index 4ff3dfd..e23c3c0 100644 --- a/drivers/staging/media/atomisp/i2c/ov2722.c +++ b/drivers/staging/media/atomisp/i2c/ov2722.c @@ -505,7 +505,8 @@ static long ov2722_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) } /* This returns the exposure time being used. This should only be used - for filling in EXIF data, not for actual image processing. */ + * for filling in EXIF data, not for actual image processing. + */ static int ov2722_q_exposure(struct v4l2_subdev *sd, s32 *value) { struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -687,7 +688,8 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag) return dev->platform_data->gpio_ctrl(sd, flag); /* Note: the GPIO order is asymmetric: always RESET# - * before PWDN# when turning it on or off. */ + * before PWDN# when turning it on or off. + */ ret = dev->platform_data->gpio0_ctrl(sd, flag); /* *ov2722 PWDN# active high when pull down,opposite to the convention diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c index 46b702e..6184019 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c @@ -39,7 +39,7 @@ static const int32_t div_lut_intercepts[BNLM_DIV_LUT_SIZE] = { * lut_thr : array containing threshold values for lut * lut_val : array containing output values related to lut_thr * lut_size: Size of lut_val array - * */ + */ static inline void bnlm_lut_encode(struct bnlm_lut *lut, const int32_t *lut_thr, const int32_t *lut_val, const uint32_t lut_size) { @@ -56,7 +56,7 @@ bnlm_lut_encode(struct bnlm_lut *lut, const int32_t *lut_thr, const int32_t *lut * Then these elements are copied into other groups inside the same * vector. If the LUT size is less than 16, then remaining elements are * set to 0. - * */ + */ assert((lut_size >= 2) && (lut_size <= block_size)); /* array lut_thr has (lut_size-1) entries */ for (i = 0; i < lut_size-2; i++) { @@ -90,7 +90,7 @@ bnlm_lut_encode(struct bnlm_lut *lut, const int32_t *lut_thr, const int32_t *lut /* * - Encodes BNLM public parameters into VMEM parameters * - Generates VMEM parameters which will needed internally ISP - * */ + */ void ia_css_bnlm_vmem_encode( struct bnlm_vmem_params *to, -- cgit v1.1