[RESEND] gpu: drm: bridge: sii9234: convert to devm_i2c_new_dummy_device
diff mbox series

Message ID 20191008203322.3238-1-wsa+renesas@sang-engineering.com
State Awaiting Upstream
Headers show
Series
  • [RESEND] gpu: drm: bridge: sii9234: convert to devm_i2c_new_dummy_device
Related show

Commit Message

Wolfram Sang Oct. 8, 2019, 8:33 p.m. UTC
Move from the deprecated i2c_new_dummy() to devm_i2c_new_dummy_device().
We now get an ERRPTR which we use in error handling and we can skip
removal of the created devices.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Rebased to v5.4-rc2 since last time. One of the last two users of the
old API, so please apply soon, so I can remove the old interface. Only
build tested.

 drivers/gpu/drm/bridge/sii9234.c | 36 +++++++++++---------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

Comments

Laurent Pinchart Oct. 9, 2019, 8:16 a.m. UTC | #1
Hi Wolfram,

Thank you for the patch.

On Tue, Oct 08, 2019 at 10:33:22PM +0200, Wolfram Sang wrote:
> Move from the deprecated i2c_new_dummy() to devm_i2c_new_dummy_device().
> We now get an ERRPTR which we use in error handling and we can skip
> removal of the created devices.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

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

> ---
> 
> Rebased to v5.4-rc2 since last time. One of the last two users of the
> old API, so please apply soon, so I can remove the old interface. Only
> build tested.
> 
>  drivers/gpu/drm/bridge/sii9234.c | 36 +++++++++++---------------------
>  1 file changed, 12 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index 25d4ad8c7ad6..8a6c85693a88 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -841,39 +841,28 @@ static int sii9234_init_resources(struct sii9234 *ctx,
>  
>  	ctx->client[I2C_MHL] = client;
>  
> -	ctx->client[I2C_TPI] = i2c_new_dummy(adapter, I2C_TPI_ADDR);
> -	if (!ctx->client[I2C_TPI]) {
> +	ctx->client[I2C_TPI] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							 I2C_TPI_ADDR);
> +	if (IS_ERR(ctx->client[I2C_TPI])) {
>  		dev_err(ctx->dev, "failed to create TPI client\n");
> -		return -ENODEV;
> +		return PTR_ERR(ctx->client[I2C_TPI]);
>  	}
>  
> -	ctx->client[I2C_HDMI] = i2c_new_dummy(adapter, I2C_HDMI_ADDR);
> -	if (!ctx->client[I2C_HDMI]) {
> +	ctx->client[I2C_HDMI] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							  I2C_HDMI_ADDR);
> +	if (IS_ERR(ctx->client[I2C_HDMI])) {
>  		dev_err(ctx->dev, "failed to create HDMI RX client\n");
> -		goto fail_tpi;
> +		return PTR_ERR(ctx->client[I2C_HDMI]);
>  	}
>  
> -	ctx->client[I2C_CBUS] = i2c_new_dummy(adapter, I2C_CBUS_ADDR);
> -	if (!ctx->client[I2C_CBUS]) {
> +	ctx->client[I2C_CBUS] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							  I2C_CBUS_ADDR);
> +	if (IS_ERR(ctx->client[I2C_CBUS])) {
>  		dev_err(ctx->dev, "failed to create CBUS client\n");
> -		goto fail_hdmi;
> +		return PTR_ERR(ctx->client[I2C_CBUS]);
>  	}
>  
>  	return 0;
> -
> -fail_hdmi:
> -	i2c_unregister_device(ctx->client[I2C_HDMI]);
> -fail_tpi:
> -	i2c_unregister_device(ctx->client[I2C_TPI]);
> -
> -	return -ENODEV;
> -}
> -
> -static void sii9234_deinit_resources(struct sii9234 *ctx)
> -{
> -	i2c_unregister_device(ctx->client[I2C_CBUS]);
> -	i2c_unregister_device(ctx->client[I2C_HDMI]);
> -	i2c_unregister_device(ctx->client[I2C_TPI]);
>  }
>  
>  static inline struct sii9234 *bridge_to_sii9234(struct drm_bridge *bridge)
> @@ -950,7 +939,6 @@ static int sii9234_remove(struct i2c_client *client)
>  
>  	sii9234_cable_out(ctx);
>  	drm_bridge_remove(&ctx->bridge);
> -	sii9234_deinit_resources(ctx);
>  
>  	return 0;
>  }
Andrzej Hajda Oct. 10, 2019, 7:01 a.m. UTC | #2
On 08.10.2019 22:33, Wolfram Sang wrote:
> Move from the deprecated i2c_new_dummy() to devm_i2c_new_dummy_device().
> We now get an ERRPTR which we use in error handling and we can skip
> removal of the created devices.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---


Applied, thx.


Rergards

Andrzej


>
> Rebased to v5.4-rc2 since last time. One of the last two users of the
> old API, so please apply soon, so I can remove the old interface. Only
> build tested.
>
>  drivers/gpu/drm/bridge/sii9234.c | 36 +++++++++++---------------------
>  1 file changed, 12 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
> index 25d4ad8c7ad6..8a6c85693a88 100644
> --- a/drivers/gpu/drm/bridge/sii9234.c
> +++ b/drivers/gpu/drm/bridge/sii9234.c
> @@ -841,39 +841,28 @@ static int sii9234_init_resources(struct sii9234 *ctx,
>  
>  	ctx->client[I2C_MHL] = client;
>  
> -	ctx->client[I2C_TPI] = i2c_new_dummy(adapter, I2C_TPI_ADDR);
> -	if (!ctx->client[I2C_TPI]) {
> +	ctx->client[I2C_TPI] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							 I2C_TPI_ADDR);
> +	if (IS_ERR(ctx->client[I2C_TPI])) {
>  		dev_err(ctx->dev, "failed to create TPI client\n");
> -		return -ENODEV;
> +		return PTR_ERR(ctx->client[I2C_TPI]);
>  	}
>  
> -	ctx->client[I2C_HDMI] = i2c_new_dummy(adapter, I2C_HDMI_ADDR);
> -	if (!ctx->client[I2C_HDMI]) {
> +	ctx->client[I2C_HDMI] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							  I2C_HDMI_ADDR);
> +	if (IS_ERR(ctx->client[I2C_HDMI])) {
>  		dev_err(ctx->dev, "failed to create HDMI RX client\n");
> -		goto fail_tpi;
> +		return PTR_ERR(ctx->client[I2C_HDMI]);
>  	}
>  
> -	ctx->client[I2C_CBUS] = i2c_new_dummy(adapter, I2C_CBUS_ADDR);
> -	if (!ctx->client[I2C_CBUS]) {
> +	ctx->client[I2C_CBUS] = devm_i2c_new_dummy_device(&client->dev, adapter,
> +							  I2C_CBUS_ADDR);
> +	if (IS_ERR(ctx->client[I2C_CBUS])) {
>  		dev_err(ctx->dev, "failed to create CBUS client\n");
> -		goto fail_hdmi;
> +		return PTR_ERR(ctx->client[I2C_CBUS]);
>  	}
>  
>  	return 0;
> -
> -fail_hdmi:
> -	i2c_unregister_device(ctx->client[I2C_HDMI]);
> -fail_tpi:
> -	i2c_unregister_device(ctx->client[I2C_TPI]);
> -
> -	return -ENODEV;
> -}
> -
> -static void sii9234_deinit_resources(struct sii9234 *ctx)
> -{
> -	i2c_unregister_device(ctx->client[I2C_CBUS]);
> -	i2c_unregister_device(ctx->client[I2C_HDMI]);
> -	i2c_unregister_device(ctx->client[I2C_TPI]);
>  }
>  
>  static inline struct sii9234 *bridge_to_sii9234(struct drm_bridge *bridge)
> @@ -950,7 +939,6 @@ static int sii9234_remove(struct i2c_client *client)
>  
>  	sii9234_cable_out(ctx);
>  	drm_bridge_remove(&ctx->bridge);
> -	sii9234_deinit_resources(ctx);
>  
>  	return 0;
>  }

Patch
diff mbox series

diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
index 25d4ad8c7ad6..8a6c85693a88 100644
--- a/drivers/gpu/drm/bridge/sii9234.c
+++ b/drivers/gpu/drm/bridge/sii9234.c
@@ -841,39 +841,28 @@  static int sii9234_init_resources(struct sii9234 *ctx,
 
 	ctx->client[I2C_MHL] = client;
 
-	ctx->client[I2C_TPI] = i2c_new_dummy(adapter, I2C_TPI_ADDR);
-	if (!ctx->client[I2C_TPI]) {
+	ctx->client[I2C_TPI] = devm_i2c_new_dummy_device(&client->dev, adapter,
+							 I2C_TPI_ADDR);
+	if (IS_ERR(ctx->client[I2C_TPI])) {
 		dev_err(ctx->dev, "failed to create TPI client\n");
-		return -ENODEV;
+		return PTR_ERR(ctx->client[I2C_TPI]);
 	}
 
-	ctx->client[I2C_HDMI] = i2c_new_dummy(adapter, I2C_HDMI_ADDR);
-	if (!ctx->client[I2C_HDMI]) {
+	ctx->client[I2C_HDMI] = devm_i2c_new_dummy_device(&client->dev, adapter,
+							  I2C_HDMI_ADDR);
+	if (IS_ERR(ctx->client[I2C_HDMI])) {
 		dev_err(ctx->dev, "failed to create HDMI RX client\n");
-		goto fail_tpi;
+		return PTR_ERR(ctx->client[I2C_HDMI]);
 	}
 
-	ctx->client[I2C_CBUS] = i2c_new_dummy(adapter, I2C_CBUS_ADDR);
-	if (!ctx->client[I2C_CBUS]) {
+	ctx->client[I2C_CBUS] = devm_i2c_new_dummy_device(&client->dev, adapter,
+							  I2C_CBUS_ADDR);
+	if (IS_ERR(ctx->client[I2C_CBUS])) {
 		dev_err(ctx->dev, "failed to create CBUS client\n");
-		goto fail_hdmi;
+		return PTR_ERR(ctx->client[I2C_CBUS]);
 	}
 
 	return 0;
-
-fail_hdmi:
-	i2c_unregister_device(ctx->client[I2C_HDMI]);
-fail_tpi:
-	i2c_unregister_device(ctx->client[I2C_TPI]);
-
-	return -ENODEV;
-}
-
-static void sii9234_deinit_resources(struct sii9234 *ctx)
-{
-	i2c_unregister_device(ctx->client[I2C_CBUS]);
-	i2c_unregister_device(ctx->client[I2C_HDMI]);
-	i2c_unregister_device(ctx->client[I2C_TPI]);
 }
 
 static inline struct sii9234 *bridge_to_sii9234(struct drm_bridge *bridge)
@@ -950,7 +939,6 @@  static int sii9234_remove(struct i2c_client *client)
 
 	sii9234_cable_out(ctx);
 	drm_bridge_remove(&ctx->bridge);
-	sii9234_deinit_resources(ctx);
 
 	return 0;
 }