Skip to content

L
linux
Commit c9a05cec authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files
Options

media: ov5647: Fix style issues 

The driver has some obvious style issues which are worth fixing before
expanding the driver capabilities.

Fix:
- Variable declaration order
- Function parameters alignment
- Multi-line comments and spurious line breaks
- Use lowercase for hexadecimal values
- > 80 cols lines

Cosmetic change, no functional changes intended.
Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 7a482630
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 55 deletions
drivers/media/i2c/ov5647.c
View file @ c9a05cec
......@@ -34,8 +34,6 @@
#include <media/v4l2-image-sizes.h>
#include <media/v4l2-mediabus.h>
#define SENSOR_NAME "ov5647"
/*
* From the datasheet, "20ms after PWDN goes low or 20ms after RESETB goes
* high if reset is inserted after PWDN goes high, host can access sensor's
......@@ -50,9 +48,9 @@
#define OV5647_SW_STANDBY 0x0100
#define OV5647_SW_RESET 0x0103
#define OV5647_REG_CHIPID_H 0x300A
#define OV5647_REG_CHIPID_L 0x300B
#define OV5640_REG_PAD_OUT 0x300D
#define OV5647_REG_CHIPID_H 0x300a
#define OV5647_REG_CHIPID_L 0x300b
#define OV5640_REG_PAD_OUT 0x300d
#define OV5647_REG_FRAME_OFF_NUMBER 0x4202
#define OV5647_REG_MIPI_CTRL00 0x4800
#define OV5647_REG_MIPI_CTRL14 0x4814
......@@ -158,7 +156,7 @@ static struct regval_list ov5647_640x480[] = {
{0x3808, 0x02},
{0x3809, 0x80},
{0x380a, 0x01},
{0x380b, 0xE0},
{0x380b, 0xe0},
{0x3801, 0x00},
{0x3802, 0x00},
{0x3803, 0x00},
......@@ -209,9 +207,9 @@ static struct regval_list ov5647_640x480[] = {
static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)
{
int ret;
unsigned char data[3] = { reg >> 8, reg & 0xff, val};
struct i2c_client *client = v4l2_get_subdevdata(sd);
int ret;
ret = i2c_master_send(client, data, 3);
if (ret < 0)
......@@ -223,9 +221,9 @@ static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)
static int ov5647_read(struct v4l2_subdev *sd, u16 reg, u8 *val)
{
int ret;
unsigned char data_w[2] = { reg >> 8, reg & 0xff };
struct i2c_client *client = v4l2_get_subdevdata(sd);
int ret;
ret = i2c_master_send(client, data_w, 2);
if (ret < 0) {
......@@ -266,7 +264,9 @@ static int ov5647_set_virtual_channel(struct v4l2_subdev *sd, int channel)
return ret;
channel_id &= ~(3 << 6);
return ov5647_write(sd, OV5647_REG_MIPI_CTRL14, channel_id | (channel << 6));
return ov5647_write(sd, OV5647_REG_MIPI_CTRL14,
channel_id | (channel << 6));
}
static int ov5647_stream_on(struct v4l2_subdev *sd)
......@@ -294,8 +294,9 @@ static int ov5647_stream_off(struct v4l2_subdev *sd)
{
int ret;
ret = ov5647_write(sd, OV5647_REG_MIPI_CTRL00, MIPI_CTRL00_CLOCK_LANE_GATE
| MIPI_CTRL00_BUS_IDLE | MIPI_CTRL00_CLOCK_LANE_DISABLE);
ret = ov5647_write(sd, OV5647_REG_MIPI_CTRL00,
MIPI_CTRL00_CLOCK_LANE_GATE | MIPI_CTRL00_BUS_IDLE |
MIPI_CTRL00_CLOCK_LANE_DISABLE);
if (ret < 0)
return ret;
......@@ -325,9 +326,9 @@ static int set_sw_standby(struct v4l2_subdev *sd, bool standby)
static int __sensor_init(struct v4l2_subdev *sd)
{
int ret;
u8 resetval, rdval;
struct i2c_client *client = v4l2_get_subdevdata(sd);
u8 resetval, rdval;
int ret;
ret = ov5647_read(sd, OV5647_SW_STANDBY, &rdval);
if (ret < 0)
......@@ -355,17 +356,15 @@ static int __sensor_init(struct v4l2_subdev *sd)
return ret;
}
/*
* stream off to make the clock lane into LP-11 state.
*/
/* Stream off to make the clock lane into LP-11 state. */
return ov5647_stream_off(sd);
}
static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)
{
int ret = 0;
struct ov5647 *ov5647 = to_state(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct ov5647 *ov5647 = to_state(sd);
int ret = 0;
mutex_lock(&ov5647->lock);
......@@ -404,17 +403,14 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)
ret = ov5647_write_array(sd, sensor_oe_disable_regs,
ARRAY_SIZE(sensor_oe_disable_regs));
if (ret < 0)
dev_dbg(&client->dev, "disable oe failed\n");
ret = set_sw_standby(sd, true);
if (ret < 0)
dev_dbg(&client->dev, "soft stby failed\n");
clk_disable_unprepare(ov5647->xclk);
gpiod_set_value_cansleep(ov5647->pwdn, 1);
}
......@@ -432,8 +428,8 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)
static int ov5647_sensor_get_register(struct v4l2_subdev *sd,
struct v4l2_dbg_register *reg)
{
u8 val;
int ret;
u8 val;
ret = ov5647_read(sd, reg->reg & 0xff, &val);
if (ret < 0)
......@@ -452,9 +448,7 @@ static int ov5647_sensor_set_register(struct v4l2_subdev *sd,
}
#endif
/*
* Subdev core operations registration
*/
/* Subdev core operations registration */
static const struct v4l2_subdev_core_ops ov5647_subdev_core_ops = {
.s_power = ov5647_sensor_power,
#ifdef CONFIG_VIDEO_ADV_DEBUG
......@@ -493,7 +487,7 @@ static int ov5647_set_get_fmt(struct v4l2_subdev *sd,
{
struct v4l2_mbus_framefmt *fmt = &format->format;
/* Only one format is supported, so return that */
/* Only one format is supported, so return that. */
memset(fmt, 0, sizeof(*fmt));
fmt->code = MEDIA_BUS_FMT_SBGGR8_1X8;
fmt->colorspace = V4L2_COLORSPACE_SRGB;
......@@ -518,9 +512,9 @@ static const struct v4l2_subdev_ops ov5647_subdev_ops = {
static int ov5647_detect(struct v4l2_subdev *sd)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
u8 read;
int ret;
struct i2c_client *client = v4l2_get_subdevdata(sd);
ret = ov5647_write(sd, OV5647_SW_RESET, 0x01);
if (ret < 0)
......@@ -551,8 +545,7 @@ static int ov5647_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
{
struct v4l2_mbus_framefmt *format =
v4l2_subdev_get_try_format(sd, fh->pad, 0);
struct v4l2_rect *crop =
v4l2_subdev_get_try_crop(sd, fh->pad, 0);
struct v4l2_rect *crop = v4l2_subdev_get_try_crop(sd, fh->pad, 0);
crop->left = OV5647_COLUMN_START_DEF;
crop->top = OV5647_ROW_START_DEF;
......@@ -578,7 +571,6 @@ static int ov5647_parse_dt(struct ov5647 *sensor, struct device_node *np)
.bus_type = V4L2_MBUS_CSI2_DPHY,
};
struct device_node *ep;
int ret;
ep = of_graph_get_next_endpoint(np, NULL);
......@@ -594,17 +586,18 @@ static int ov5647_parse_dt(struct ov5647 *sensor, struct device_node *np)
out:
of_node_put(ep);
return ret;
}
static int ov5647_probe(struct i2c_client *client)
{
struct device_node *np = client->dev.of_node;
struct device *dev = &client->dev;
struct ov5647 *sensor;
int ret;
struct v4l2_subdev *sd;
struct device_node *np = client->dev.of_node;
u32 xclk_freq;
int ret;
sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
if (!sensor)
......@@ -618,7 +611,6 @@ static int ov5647_probe(struct i2c_client *client)
}
}
/* get system clock (xclk) */
sensor->xclk = devm_clk_get(dev, NULL);
if (IS_ERR(sensor->xclk)) {
dev_err(dev, "could not get xclk");
......@@ -631,9 +623,8 @@ static int ov5647_probe(struct i2c_client *client)
return -EINVAL;
}
/* Request the power down GPIO asserted */
sensor->pwdn = devm_gpiod_get_optional(&client->dev, "pwdn",
GPIOD_OUT_HIGH);
/* Request the power down GPIO asserted. */
sensor->pwdn = devm_gpiod_get_optional(dev, "pwdn", GPIOD_OUT_HIGH);
if (IS_ERR(sensor->pwdn)) {
dev_err(dev, "Failed to get 'pwdn' gpio\n");
return -EINVAL;
......@@ -643,14 +634,14 @@ static int ov5647_probe(struct i2c_client *client)
sd = &sensor->sd;
v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops);
sensor->sd.internal_ops = &ov5647_subdev_internal_ops;
sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
sd->internal_ops = &ov5647_subdev_internal_ops;
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
ret = media_entity_pads_init(&sd->entity, 1, &sensor->pad);
if (ret < 0)
goto mutex_remove;
goto mutex_destroy;
if (sensor->pwdn) {
gpiod_set_value_cansleep(sensor->pwdn, 0);
......@@ -658,22 +649,23 @@ static int ov5647_probe(struct i2c_client *client)
}
ret = ov5647_detect(sd);
gpiod_set_value_cansleep(sensor->pwdn, 1);
if (ret < 0)
goto error;
goto entity_cleanup;
ret = v4l2_async_register_subdev(sd);
if (ret < 0)
goto error;
goto entity_cleanup;
dev_dbg(dev, "OmniVision OV5647 camera driver probed\n");
return 0;
error:
entity_cleanup:
media_entity_cleanup(&sd->entity);
mutex_remove:
mutex_destroy:
mutex_destroy(&sensor->lock);
return ret;
}
......@@ -692,7 +684,7 @@ static int ov5647_remove(struct i2c_client *client)
static const struct i2c_device_id ov5647_id[] = {
{ "ov5647", 0 },
{ }
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, ov5647_id);
......@@ -707,7 +699,7 @@ MODULE_DEVICE_TABLE(of, ov5647_of_match);
static struct i2c_driver ov5647_driver = {
.driver = {
.of_match_table = of_match_ptr(ov5647_of_match),
.name = SENSOR_NAME,
.name = "ov5647",
},
.probe_new = ov5647_probe,
.remove = ov5647_remove,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7