From 36e4f2b2e3f7a9d8f9f08bc68a05d64d23b34c3d Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Date: Tue, 5 Jan 2021 15:47:19 +0100 Subject: [PATCH] media: i2c: ov5648/ov8865: Minor cosmetic fixes This solves a few minor cosmetic issues picked up by checkpatch for the OV5648 and OV8865 drivers. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/media/i2c/ov5648.c | 3 ++- drivers/media/i2c/ov8865.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index 609aa67b54ce9..110190b322e24 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -496,7 +496,8 @@ container_of(s, struct ov5648_sensor, subdev) #define ov5648_ctrl_subdev(c) \ - (&container_of(c->handler, struct ov5648_sensor, ctrls.handler)->subdev) + (&container_of((c)->handler, struct ov5648_sensor, \ + ctrls.handler)->subdev) /* Data structures */ diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index fda5a55979aa2..ab4804d5b2853 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -223,7 +223,6 @@ #define OV8865_FORMAT2_FLIP_HORZ_SENSOR_EN BIT(1) #define OV8865_FORMAT2_SYNC_HBIN_EN BIT(0) - #define OV8865_INC_Y_ODD_REG 0x382a #define OV8865_INC_Y_ODD(v) ((v) & GENMASK(4, 0)) #define OV8865_INC_Y_EVEN_REG 0x382b @@ -460,7 +459,8 @@ container_of(s, struct ov8865_sensor, subdev) #define ov8865_ctrl_subdev(c) \ - (&container_of(c->handler, struct ov8865_sensor, ctrls.handler)->subdev) + (&container_of((c)->handler, struct ov8865_sensor, \ + ctrls.handler)->subdev) /* Data structures */ @@ -1598,8 +1598,8 @@ static int ov8865_mode_pll1_configure(struct ov8865_sensor *sensor, return ret; ret = ov8865_update_bits(sensor, OV8865_PCLK_SEL_REG, - OV8865_PCLK_SEL_PCLK_DIV_MASK, - OV8865_PCLK_SEL_PCLK_DIV(config->pclk_div)); + OV8865_PCLK_SEL_PCLK_DIV_MASK, + OV8865_PCLK_SEL_PCLK_DIV(config->pclk_div)); if (ret) return ret;