media: i2c: ov13858: Replace client->dev usage

The driver needs to access the struct device in many places, and
retrieves it from the i2c_client itself retrieved with
v4l2_get_subdevdata(). Store it as a pointer in struct ov13858 and
access it from there instead, to simplify the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index 7a3fc1d2851419cfcb60dcaeaaa48fa35d2c12ea..d93ad730d63328a38e2a95ae1517f1a87b66039c 100644 (file)
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -1028,6 +1028,8 @@ static const struct ov13858_mode supported_modes[] = {
 };
 
 struct ov13858 {
+       struct device *dev;
+
        struct v4l2_subdev sd;
        struct media_pad pad;
 
@@ -1117,7 +1119,6 @@ static int ov13858_write_reg(struct ov13858 *ov13858, u16 reg, u32 len,
 static int ov13858_write_regs(struct ov13858 *ov13858,
                              const struct ov13858_reg *regs, u32 len)
 {
-       struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
        int ret;
        u32 i;
 
@@ -1126,7 +1127,7 @@ static int ov13858_write_regs(struct ov13858 *ov13858,
                                        regs[i].val);
                if (ret) {
                        dev_err_ratelimited(
-                               &client->dev,
+                               ov13858->dev,
                                "Failed to write reg 0x%4.4x. error = %d\n",
                                regs[i].address, ret);
 
@@ -1209,7 +1210,6 @@ static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)
 {
        struct ov13858 *ov13858 = container_of(ctrl->handler,
                                               struct ov13858, ctrl_handler);
-       struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
        s64 max;
        int ret;
 
@@ -1228,7 +1228,7 @@ static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)
         * Applying V4L2 control value only happens
         * when power is up for streaming
         */
-       if (!pm_runtime_get_if_in_use(&client->dev))
+       if (!pm_runtime_get_if_in_use(ov13858->dev))
                return 0;
 
        ret = 0;
@@ -1256,13 +1256,13 @@ static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)
                ret = ov13858_enable_test_pattern(ov13858, ctrl->val);
                break;
        default:
-               dev_info(&client->dev,
+               dev_info(ov13858->dev,
                         "ctrl(id:0x%x,val:0x%x) is not handled\n",
                         ctrl->id, ctrl->val);
                break;
        }
 
-       pm_runtime_put(&client->dev);
+       pm_runtime_put(ov13858->dev);
 
        return ret;
 }
@@ -1408,7 +1408,6 @@ static int ov13858_get_skip_frames(struct v4l2_subdev *sd, u32 *frames)
 /* Start streaming */
 static int ov13858_start_streaming(struct ov13858 *ov13858)
 {
-       struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
        const struct ov13858_reg_list *reg_list;
        int ret, link_freq_index;
 
@@ -1416,7 +1415,7 @@ static int ov13858_start_streaming(struct ov13858 *ov13858)
        ret = ov13858_write_reg(ov13858, OV13858_REG_SOFTWARE_RST,
                                OV13858_REG_VALUE_08BIT, OV13858_SOFTWARE_RST);
        if (ret) {
-               dev_err(&client->dev, "%s failed to set powerup registers\n",
+               dev_err(ov13858->dev, "%s failed to set powerup registers\n",
                        __func__);
                return ret;
        }
@@ -1426,7 +1425,7 @@ static int ov13858_start_streaming(struct ov13858 *ov13858)
        reg_list = &link_freq_configs[link_freq_index].reg_list;
        ret = ov13858_write_reg_list(ov13858, reg_list);
        if (ret) {
-               dev_err(&client->dev, "%s failed to set plls\n", __func__);
+               dev_err(ov13858->dev, "%s failed to set plls\n", __func__);
                return ret;
        }
 
@@ -1434,7 +1433,7 @@ static int ov13858_start_streaming(struct ov13858 *ov13858)
        reg_list = &ov13858->cur_mode->reg_list;
        ret = ov13858_write_reg_list(ov13858, reg_list);
        if (ret) {
-               dev_err(&client->dev, "%s failed to set mode\n", __func__);
+               dev_err(ov13858->dev, "%s failed to set mode\n", __func__);
                return ret;
        }
 
@@ -1458,13 +1457,12 @@ static int ov13858_stop_streaming(struct ov13858 *ov13858)
 static int ov13858_set_stream(struct v4l2_subdev *sd, int enable)
 {
        struct ov13858 *ov13858 = to_ov13858(sd);
-       struct i2c_client *client = v4l2_get_subdevdata(sd);
        int ret = 0;
 
        mutex_lock(&ov13858->mutex);
 
        if (enable) {
-               ret = pm_runtime_resume_and_get(&client->dev);
+               ret = pm_runtime_resume_and_get(ov13858->dev);
                if (ret < 0)
                        goto err_unlock;
 
@@ -1477,7 +1475,7 @@ static int ov13858_set_stream(struct v4l2_subdev *sd, int enable)
                        goto err_rpm_put;
        } else {
                ov13858_stop_streaming(ov13858);
-               pm_runtime_put(&client->dev);
+               pm_runtime_put(ov13858->dev);
        }
 
        mutex_unlock(&ov13858->mutex);
@@ -1485,7 +1483,7 @@ static int ov13858_set_stream(struct v4l2_subdev *sd, int enable)
        return ret;
 
 err_rpm_put:
-       pm_runtime_put(&client->dev);
+       pm_runtime_put(ov13858->dev);
 err_unlock:
        mutex_unlock(&ov13858->mutex);
 
@@ -1495,7 +1493,6 @@ err_unlock:
 /* Verify chip ID */
 static int ov13858_identify_module(struct ov13858 *ov13858)
 {
-       struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
        int ret;
        u32 val;
 
@@ -1505,7 +1502,7 @@ static int ov13858_identify_module(struct ov13858 *ov13858)
                return ret;
 
        if (val != OV13858_CHIP_ID) {
-               dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
+               dev_err(ov13858->dev, "chip id mismatch: %x!=%x\n",
                        OV13858_CHIP_ID, val);
                return -EIO;
        }
@@ -1552,7 +1549,6 @@ static const struct v4l2_subdev_internal_ops ov13858_internal_ops = {
 /* Initialize control handlers */
 static int ov13858_init_controls(struct ov13858 *ov13858)
 {
-       struct i2c_client *client = v4l2_get_subdevdata(&ov13858->sd);
        struct v4l2_fwnode_device_properties props;
        struct v4l2_ctrl_handler *ctrl_hdlr;
        s64 exposure_max;
@@ -1626,12 +1622,12 @@ static int ov13858_init_controls(struct ov13858 *ov13858)
                                     0, 0, ov13858_test_pattern_menu);
        if (ctrl_hdlr->error) {
                ret = ctrl_hdlr->error;
-               dev_err(&client->dev, "%s control init failed (%d)\n",
+               dev_err(ov13858->dev, "%s control init failed (%d)\n",
                        __func__, ret);
                goto error;
        }
 
-       ret = v4l2_fwnode_device_parse(&client->dev, &props);
+       ret = v4l2_fwnode_device_parse(ov13858->dev, &props);
        if (ret)
                goto error;
 
@@ -1671,13 +1667,15 @@ static int ov13858_probe(struct i2c_client *client)
        if (!ov13858)
                return -ENOMEM;
 
+       ov13858->dev = &client->dev;
+
        /* Initialize subdev */
        v4l2_i2c_subdev_init(&ov13858->sd, client, &ov13858_subdev_ops);
 
        /* Check module identity */
        ret = ov13858_identify_module(ov13858);
        if (ret) {
-               dev_err(&client->dev, "failed to find sensor: %d\n", ret);
+               dev_err(ov13858->dev, "failed to find sensor: %d\n", ret);
                return ret;
        }
 
@@ -1699,7 +1697,7 @@ static int ov13858_probe(struct i2c_client *client)
        ov13858->pad.flags = MEDIA_PAD_FL_SOURCE;
        ret = media_entity_pads_init(&ov13858->sd.entity, 1, &ov13858->pad);
        if (ret) {
-               dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
+               dev_err(ov13858->dev, "%s failed:%d\n", __func__, ret);
                goto error_handler_free;
        }
 
@@ -1711,9 +1709,9 @@ static int ov13858_probe(struct i2c_client *client)
         * Device is already turned on by i2c-core with ACPI domain PM.
         * Enable runtime PM and turn off the device.
         */
-       pm_runtime_set_active(&client->dev);
-       pm_runtime_enable(&client->dev);
-       pm_runtime_idle(&client->dev);
+       pm_runtime_set_active(ov13858->dev);
+       pm_runtime_enable(ov13858->dev);
+       pm_runtime_idle(ov13858->dev);
 
        return 0;
 
@@ -1722,7 +1720,7 @@ error_media_entity:
 
 error_handler_free:
        ov13858_free_controls(ov13858);
-       dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
+       dev_err(ov13858->dev, "%s failed:%d\n", __func__, ret);
 
        return ret;
 }
@@ -1736,7 +1734,7 @@ static void ov13858_remove(struct i2c_client *client)
        media_entity_cleanup(&sd->entity);
        ov13858_free_controls(ov13858);
 
-       pm_runtime_disable(&client->dev);
+       pm_runtime_disable(ov13858->dev);
 }
 
 static const struct i2c_device_id ov13858_id_table[] = {