diff mbox

[01/15] video: atmel_lcdfb: Remove redundant dev_set_drvdata

Message ID 52440E0A.8080609@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tomi Valkeinen Sept. 26, 2013, 10:35 a.m. UTC 
On 20/09/13 09:32, Sachin Kamat wrote:
> Driver core sets driver data to NULL upon failure or remove.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>  drivers/video/atmel_lcdfb.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
> index 34e934d..70052e7 100644
> --- a/drivers/video/atmel_lcdfb.c
> +++ b/drivers/video/atmel_lcdfb.c
> @@ -1318,7 +1318,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
>  	return 0;
>  
>  reset_drvdata:
> -	dev_set_drvdata(dev, NULL);
>  	fb_dealloc_cmap(&info->cmap);
>  unregister_irqs:
>  	cancel_work_sync(&sinfo->task);
> @@ -1379,7 +1378,6 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
>  		atmel_lcdfb_free_video_memory(sinfo);
>  	}
>  
> -	dev_set_drvdata(dev, NULL);
>  	framebuffer_release(info);
>  
>  	return 0;
> 

I had to modify this one as follows. Are you fine with it?

commit 8d84d1223dbbaceb5cbf25b597e48a59c36b8c91
Author: Sachin Kamat <sachin.kamat@linaro.org>
Date:   Fri Sep 20 12:02:10 2013 +0530

    video: atmel_lcdfb: Remove redundant dev_set_drvdata
    
    Driver core sets driver data to NULL upon failure or remove.
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

Comments

Sachin Kamat Sept. 26, 2013, 11:48 a.m. UTC | #1 
On 26 September 2013 16:05, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> On 20/09/13 09:32, Sachin Kamat wrote:

> I had to modify this one as follows. Are you fine with it?

Looks good to me. Thanks Tomi.
diff mbox

Patch

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index df05550..3f7d6dc 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1089,7 +1089,7 @@  static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 	ret = register_framebuffer(info);
 	if (ret < 0) {
 		dev_err(dev, "failed to register framebuffer device: %d\n", ret);
-		goto reset_drvdata;
+		goto free_cmap;
 	}
 
 	/* add selected videomode to modelist */
@@ -1105,8 +1105,6 @@  static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 
 	return 0;
 
-reset_drvdata:
-	dev_set_drvdata(dev, NULL);
 free_cmap:
 	fb_dealloc_cmap(&info->cmap);
 unregister_irqs:
@@ -1167,7 +1165,6 @@  static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
 		atmel_lcdfb_free_video_memory(sinfo);
 	}
 
-	dev_set_drvdata(dev, NULL);
 	framebuffer_release(info);
 
 	return 0;