diff mbox series

[04/19] media: i2c: ov4689: Remove i2c_client from ov4689 struct

Message ID 20231211175023.1680247-5-mike.rudenko@gmail.com
State New
Headers
Series Omnivision OV4689 refactoring and improvements |

Commit Message

Mikhail Rudenko Dec. 11, 2023, 5:50 p.m. UTC 
  The 'client' field within the 'ov4689' structure is solely used to
access its 'dev' member. This commit removes the 'client' field and
directly stores a pointer to the 'struct device'.

Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
---
 drivers/media/i2c/ov4689.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

Comments

Laurent Pinchart Dec. 11, 2023, 6:09 p.m. UTC | #1 
Hi Mikhail,

Thank you for the patch.

On Mon, Dec 11, 2023 at 08:50:07PM +0300, Mikhail Rudenko wrote:
> The 'client' field within the 'ov4689' structure is solely used to
> access its 'dev' member. This commit removes the 'client' field and
> directly stores a pointer to the 'struct device'.
> 
> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/i2c/ov4689.c | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
> index 51a15810cb1d..8c120d7f7830 100644
> --- a/drivers/media/i2c/ov4689.c
> +++ b/drivers/media/i2c/ov4689.c
> @@ -78,7 +78,7 @@ struct ov4689_mode {
>  };
>  
>  struct ov4689 {
> -	struct i2c_client *client;
> +	struct device *dev;
>  	struct regmap *regmap;
>  	struct clk *xvclk;
>  	struct gpio_desc *reset_gpio;
> @@ -409,13 +409,13 @@ static int ov4689_get_selection(struct v4l2_subdev *sd,
>  static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
>  {
>  	struct ov4689 *ov4689 = to_ov4689(sd);
> -	struct i2c_client *client = ov4689->client;
> +	struct device *dev = ov4689->dev;
>  	int ret = 0;
>  
>  	mutex_lock(&ov4689->mutex);
>  
>  	if (on) {
> -		ret = pm_runtime_resume_and_get(&client->dev);
> +		ret = pm_runtime_resume_and_get(dev);
>  		if (ret < 0)
>  			goto unlock_and_return;
>  
> @@ -424,26 +424,26 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
>  					  ov4689->cur_mode->num_regs,
>  					  NULL);
>  		if (ret) {
> -			pm_runtime_put(&client->dev);
> +			pm_runtime_put(dev);
>  			goto unlock_and_return;
>  		}
>  
>  		ret = __v4l2_ctrl_handler_setup(&ov4689->ctrl_handler);
>  		if (ret) {
> -			pm_runtime_put(&client->dev);
> +			pm_runtime_put(dev);
>  			goto unlock_and_return;
>  		}
>  
>  		ret = cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE,
>  				OV4689_MODE_STREAMING, NULL);
>  		if (ret) {
> -			pm_runtime_put(&client->dev);
> +			pm_runtime_put(dev);
>  			goto unlock_and_return;
>  		}
>  	} else {
>  		cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE,
>  			  OV4689_MODE_SW_STANDBY, NULL);
> -		pm_runtime_put(&client->dev);
> +		pm_runtime_put(dev);
>  	}
>  
>  unlock_and_return:
> @@ -557,7 +557,6 @@ static const struct v4l2_subdev_ops ov4689_subdev_ops = {
>   */
>  static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result)
>  {
> -	const struct device *dev = &ov4689->client->dev;
>  	const struct ov4689_gain_range *range;
>  	unsigned int n;
>  
> @@ -568,7 +567,8 @@ static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result)
>  	}
>  
>  	if (n == ARRAY_SIZE(ov4689_gain_ranges)) {
> -		dev_warn_ratelimited(dev, "no mapping found for gain %d\n",
> +		dev_warn_ratelimited(ov4689->dev,
> +				     "no mapping found for gain %d\n",
>  				     logical_gain);
>  		return -EINVAL;
>  	}
> @@ -584,7 +584,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
>  {
>  	struct ov4689 *ov4689 =
>  		container_of(ctrl->handler, struct ov4689, ctrl_handler);
> -	struct i2c_client *client = ov4689->client;
> +	struct device *dev = ov4689->dev;
>  	int sensor_gain;
>  	s64 max_expo;
>  	int ret;
> @@ -601,7 +601,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
>  		break;
>  	}
>  
> -	if (!pm_runtime_get_if_in_use(&client->dev))
> +	if (!pm_runtime_get_if_in_use(dev))
>  		return 0;
>  
>  	switch (ctrl->id) {
> @@ -629,13 +629,13 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
>  		ret = ov4689_enable_test_pattern(ov4689, ctrl->val);
>  		break;
>  	default:
> -		dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n",
> +		dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n",
>  			 __func__, ctrl->id, ctrl->val);
>  		ret = -EINVAL;
>  		break;
>  	}
>  
> -	pm_runtime_put(&client->dev);
> +	pm_runtime_put(dev);
>  
>  	return ret;
>  }
> @@ -700,8 +700,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)
>  
>  	if (handler->error) {
>  		ret = handler->error;
> -		dev_err(&ov4689->client->dev, "Failed to init controls(%d)\n",
> -			ret);
> +		dev_err(ov4689->dev, "Failed to init controls(%d)\n", ret);
>  		goto err_free_handler;
>  	}
>  
> @@ -727,7 +726,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)
>  static int ov4689_check_sensor_id(struct ov4689 *ov4689,
>  				  struct i2c_client *client)
>  {
> -	struct device *dev = &ov4689->client->dev;
> +	struct device *dev = ov4689->dev;
>  	u64 id = 0;
>  	int ret;
>  
> @@ -755,7 +754,7 @@ static int ov4689_configure_regulators(struct ov4689 *ov4689)
>  	for (i = 0; i < ARRAY_SIZE(ov4689_supply_names); i++)
>  		ov4689->supplies[i].supply = ov4689_supply_names[i];
>  
> -	return devm_regulator_bulk_get(&ov4689->client->dev,
> +	return devm_regulator_bulk_get(ov4689->dev,
>  				       ARRAY_SIZE(ov4689_supply_names),
>  				       ov4689->supplies);
>  }
> @@ -824,7 +823,8 @@ static int ov4689_probe(struct i2c_client *client)
>  	if (!ov4689)
>  		return -ENOMEM;
>  
> -	ov4689->client = client;
> +	ov4689->dev = dev;
> +
>  	ov4689->cur_mode = &supported_modes[OV4689_MODE_2688_1520];
>  
>  	ov4689->xvclk = devm_clk_get_optional(dev, NULL);
diff mbox series

Patch

diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
index 51a15810cb1d..8c120d7f7830 100644
--- a/drivers/media/i2c/ov4689.c
+++ b/drivers/media/i2c/ov4689.c
@@ -78,7 +78,7 @@  struct ov4689_mode {
 };
 
 struct ov4689 {
-	struct i2c_client *client;
+	struct device *dev;
 	struct regmap *regmap;
 	struct clk *xvclk;
 	struct gpio_desc *reset_gpio;
@@ -409,13 +409,13 @@  static int ov4689_get_selection(struct v4l2_subdev *sd,
 static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
 {
 	struct ov4689 *ov4689 = to_ov4689(sd);
-	struct i2c_client *client = ov4689->client;
+	struct device *dev = ov4689->dev;
 	int ret = 0;
 
 	mutex_lock(&ov4689->mutex);
 
 	if (on) {
-		ret = pm_runtime_resume_and_get(&client->dev);
+		ret = pm_runtime_resume_and_get(dev);
 		if (ret < 0)
 			goto unlock_and_return;
 
@@ -424,26 +424,26 @@  static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
 					  ov4689->cur_mode->num_regs,
 					  NULL);
 		if (ret) {
-			pm_runtime_put(&client->dev);
+			pm_runtime_put(dev);
 			goto unlock_and_return;
 		}
 
 		ret = __v4l2_ctrl_handler_setup(&ov4689->ctrl_handler);
 		if (ret) {
-			pm_runtime_put(&client->dev);
+			pm_runtime_put(dev);
 			goto unlock_and_return;
 		}
 
 		ret = cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE,
 				OV4689_MODE_STREAMING, NULL);
 		if (ret) {
-			pm_runtime_put(&client->dev);
+			pm_runtime_put(dev);
 			goto unlock_and_return;
 		}
 	} else {
 		cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE,
 			  OV4689_MODE_SW_STANDBY, NULL);
-		pm_runtime_put(&client->dev);
+		pm_runtime_put(dev);
 	}
 
 unlock_and_return:
@@ -557,7 +557,6 @@  static const struct v4l2_subdev_ops ov4689_subdev_ops = {
  */
 static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result)
 {
-	const struct device *dev = &ov4689->client->dev;
 	const struct ov4689_gain_range *range;
 	unsigned int n;
 
@@ -568,7 +567,8 @@  static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result)
 	}
 
 	if (n == ARRAY_SIZE(ov4689_gain_ranges)) {
-		dev_warn_ratelimited(dev, "no mapping found for gain %d\n",
+		dev_warn_ratelimited(ov4689->dev,
+				     "no mapping found for gain %d\n",
 				     logical_gain);
 		return -EINVAL;
 	}
@@ -584,7 +584,7 @@  static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct ov4689 *ov4689 =
 		container_of(ctrl->handler, struct ov4689, ctrl_handler);
-	struct i2c_client *client = ov4689->client;
+	struct device *dev = ov4689->dev;
 	int sensor_gain;
 	s64 max_expo;
 	int ret;
@@ -601,7 +601,7 @@  static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
 		break;
 	}
 
-	if (!pm_runtime_get_if_in_use(&client->dev))
+	if (!pm_runtime_get_if_in_use(dev))
 		return 0;
 
 	switch (ctrl->id) {
@@ -629,13 +629,13 @@  static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
 		ret = ov4689_enable_test_pattern(ov4689, ctrl->val);
 		break;
 	default:
-		dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n",
+		dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n",
 			 __func__, ctrl->id, ctrl->val);
 		ret = -EINVAL;
 		break;
 	}
 
-	pm_runtime_put(&client->dev);
+	pm_runtime_put(dev);
 
 	return ret;
 }
@@ -700,8 +700,7 @@  static int ov4689_initialize_controls(struct ov4689 *ov4689)
 
 	if (handler->error) {
 		ret = handler->error;
-		dev_err(&ov4689->client->dev, "Failed to init controls(%d)\n",
-			ret);
+		dev_err(ov4689->dev, "Failed to init controls(%d)\n", ret);
 		goto err_free_handler;
 	}
 
@@ -727,7 +726,7 @@  static int ov4689_initialize_controls(struct ov4689 *ov4689)
 static int ov4689_check_sensor_id(struct ov4689 *ov4689,
 				  struct i2c_client *client)
 {
-	struct device *dev = &ov4689->client->dev;
+	struct device *dev = ov4689->dev;
 	u64 id = 0;
 	int ret;
 
@@ -755,7 +754,7 @@  static int ov4689_configure_regulators(struct ov4689 *ov4689)
 	for (i = 0; i < ARRAY_SIZE(ov4689_supply_names); i++)
 		ov4689->supplies[i].supply = ov4689_supply_names[i];
 
-	return devm_regulator_bulk_get(&ov4689->client->dev,
+	return devm_regulator_bulk_get(ov4689->dev,
 				       ARRAY_SIZE(ov4689_supply_names),
 				       ov4689->supplies);
 }
@@ -824,7 +823,8 @@  static int ov4689_probe(struct i2c_client *client)
 	if (!ov4689)
 		return -ENOMEM;
 
-	ov4689->client = client;
+	ov4689->dev = dev;
+
 	ov4689->cur_mode = &supported_modes[OV4689_MODE_2688_1520];
 
 	ov4689->xvclk = devm_clk_get_optional(dev, NULL);