Re: [PATCH] i2c: Remove obsolete cleanup for clientdata

[Guennadi Liakhovetski]

On Wed, 10 Nov 2010, Wolfram Sang wrote:

> A few new i2c-drivers came into the kernel which clear the clientdata-pointer
> on exit. This is obsolete meanwhile, so fix it and hope the word will spread.
> 
> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>

for imx074 and ov6650:

Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>

Thanks
Guennadi

> ---
> 
> Like last time I suggest to collect acks from the driver authors and merge it
> vie Jean's i2c-tree.
> 
>  drivers/media/video/imx074.c          |    2 --
>  drivers/media/video/ov6650.c          |    2 --
>  drivers/misc/apds9802als.c            |    1 -
>  drivers/staging/olpc_dcon/olpc_dcon.c |    3 ---
>  4 files changed, 0 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
> index 380e459..27b5dfd 100644
> --- a/drivers/media/video/imx074.c
> +++ b/drivers/media/video/imx074.c
> @@ -451,7 +451,6 @@ static int imx074_probe(struct i2c_client *client,
>  	ret = imx074_video_probe(icd, client);
>  	if (ret < 0) {
>  		icd->ops = NULL;
> -		i2c_set_clientdata(client, NULL);
>  		kfree(priv);
>  		return ret;
>  	}
> @@ -468,7 +467,6 @@ static int imx074_remove(struct i2c_client *client)
>  	icd->ops = NULL;
>  	if (icl->free_bus)
>  		icl->free_bus(icl);
> -	i2c_set_clientdata(client, NULL);
>  	client->driver = NULL;
>  	kfree(priv);
>  
> diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
> index b7cfeab..2dd5298 100644
> --- a/drivers/media/video/ov6650.c
> +++ b/drivers/media/video/ov6650.c
> @@ -1176,7 +1176,6 @@ static int ov6650_probe(struct i2c_client *client,
>  
>  	if (ret) {
>  		icd->ops = NULL;
> -		i2c_set_clientdata(client, NULL);
>  		kfree(priv);
>  	}
>  
> @@ -1187,7 +1186,6 @@ static int ov6650_remove(struct i2c_client *client)
>  {
>  	struct ov6650 *priv = to_ov6650(client);
>  
> -	i2c_set_clientdata(client, NULL);
>  	kfree(priv);
>  	return 0;
>  }
> diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
> index f9b91ba..abe3d21 100644
> --- a/drivers/misc/apds9802als.c
> +++ b/drivers/misc/apds9802als.c
> @@ -251,7 +251,6 @@ static int apds9802als_probe(struct i2c_client *client,
>  
>  	return res;
>  als_error1:
> -	i2c_set_clientdata(client, NULL);
>  	kfree(data);
>  	return res;
>  }
> diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
> index 75aa7a36..f286a4c 100644
> --- a/drivers/staging/olpc_dcon/olpc_dcon.c
> +++ b/drivers/staging/olpc_dcon/olpc_dcon.c
> @@ -733,7 +733,6 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
>   edev:
>  	platform_device_unregister(dcon_device);
>  	dcon_device = NULL;
> -	i2c_set_clientdata(client, NULL);
>   eirq:
>  	free_irq(DCON_IRQ, &dcon_driver);
>   einit:
> @@ -757,8 +756,6 @@ static int dcon_remove(struct i2c_client *client)
>  		platform_device_unregister(dcon_device);
>  	cancel_work_sync(&dcon_work);
>  
> -	i2c_set_clientdata(client, NULL);
> -
>  	return 0;
>  }
>  
> -- 
> 1.7.2.3
> 
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/