Skip to contentSkip to conversation

video: remove unnecessary platform_set_drvdata()

PATCH In review Jingoo Han 2 participants 2 messages Jun 25, 2013 – Jun 26, 2013

Subsystems (3)
Arm i.MX and Layerscape Framebuffer layer Arm Samsung Exynos
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 1/1 video: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by Jingoo Han <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Acked-by Kuninori Morimoto <[email protected]>
Acked-by Shawn Guo <[email protected]>
Reviewed-by H Hartley Sweeten <[email protected]>
---
 drivers/video/au1100fb.c         |    1 -
 drivers/video/bf54x-lq043fb.c    |    1 -
 drivers/video/bfin-lq035q1-fb.c  |    2 --
 drivers/video/bfin-t350mcqb-fb.c |    2 --
 drivers/video/ep93xx-fb.c        |    2 --
 drivers/video/imxfb.c            |    3 ---
 drivers/video/jz4740_fb.c        |    2 --
 drivers/video/mmp/fb/mmpfb.c     |    1 -
 drivers/video/mmp/hw/mmp_ctrl.c  |    1 -
 drivers/video/mxsfb.c            |    2 --
 drivers/video/nuc900fb.c         |    1 -
 drivers/video/pxa3xx-gcu.c       |    2 --
 drivers/video/pxafb.c            |    1 -
 drivers/video/s3c2410fb.c        |    2 --
 drivers/video/sa1100fb.c         |    1 -
 drivers/video/sh7760fb.c         |    1 -
 drivers/video/sh_mipi_dsi.c      |    1 -
 drivers/video/tmiofb.c           |    3 ---
 drivers/video/vga16fb.c          |    1 -
 drivers/video/vt8500lcdfb.c      |    1 -
 20 files changed, 31 deletions(-)
drivers/video/au1100fb.c +0 -1
index 700cac0..606a3ba 100644
@@ -579,7 +579,6 @@ failed:
 	if (fbdev->info.cmap.len != 0) {
 		fb_dealloc_cmap(&fbdev->info.cmap);
 	}
-	platform_set_drvdata(dev, NULL);
 
 	return -ENODEV;
 }
drivers/video/bf54x-lq043fb.c +0 -1
index 2726a5b..87f288b 100644
@@ -681,7 +681,6 @@ out3:
 out2:
 	free_dma(CH_EPPI0);
 out1:
-	platform_set_drvdata(pdev, NULL);
 
 	return ret;
 }
drivers/video/bfin-lq035q1-fb.c +0 -2
index 29d8c04..be65bae 100644
@@ -759,7 +759,6 @@ static int bfin_lq035q1_probe(struct platform_device *pdev)
  out2:
 	free_dma(CH_PPI);
  out1:
-	platform_set_drvdata(pdev, NULL);
 
 	return ret;
 }

@@ -788,7 +787,6 @@ static int bfin_lq035q1_remove(struct platform_device *pdev)
 	bfin_lq035q1_free_ports(info->disp_info->ppi_mode =
 				USE_RGB565_16_BIT_PPI);
 
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(fbinfo);
 
 	dev_info(&pdev->dev, "unregistered LCD driver\n");
drivers/video/bfin-t350mcqb-fb.c +0 -2
index d46da01..48c0c4e 100644
@@ -578,7 +578,6 @@ out3:
 out2:
 	free_dma(CH_PPI);
 out1:
-	platform_set_drvdata(pdev, NULL);
 
 	return ret;
 }

@@ -608,7 +607,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
 
 	bfin_t350mcqb_request_ports(0);
 
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(fbinfo);
 
 	printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n");
drivers/video/ep93xx-fb.c +0 -2
index ee1ee54..28a837d 100644
@@ -595,7 +595,6 @@ failed_videomem:
 	fb_dealloc_cmap(&info->cmap);
 failed_cmap:
 	kfree(info);
-	platform_set_drvdata(pdev, NULL);
 
 	return err;
 }

@@ -614,7 +613,6 @@ static int ep93xxfb_remove(struct platform_device *pdev)
 		fbi->mach_info->teardown(pdev);
 
 	kfree(info);
-	platform_set_drvdata(pdev, NULL);
 
 	return 0;
 }
drivers/video/imxfb.c +0 -3
index 0a16d82..12af22b 100644
@@ -923,7 +923,6 @@ failed_getclock:
 failed_req:
 	kfree(info->pseudo_palette);
 failed_init:
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(info);
 	return ret;
 }

@@ -955,8 +954,6 @@ static int imxfb_remove(struct platform_device *pdev)
 	iounmap(fbi->regs);
 	release_mem_region(res->start, resource_size(res));
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
drivers/video/jz4740_fb.c +0 -2
index 36979b4..2c49112 100644
@@ -737,8 +737,6 @@ static int jzfb_remove(struct platform_device *pdev)
 	fb_dealloc_cmap(&jzfb->fb->cmap);
 	jzfb_free_devmem(jzfb);
 
-	platform_set_drvdata(pdev, NULL);
-
 	framebuffer_release(jzfb->fb);
 
 	return 0;
drivers/video/mmp/fb/mmpfb.c +0 -1
index 6d1fa96..4ab95b8 100644
@@ -659,7 +659,6 @@ failed_destroy_mutex:
 	mutex_destroy(&fbi->access_ok);
 failed:
 	dev_err(fbi->dev, "mmp-fb: frame buffer device init failed\n");
-	platform_set_drvdata(pdev, NULL);
 
 	framebuffer_release(info);
drivers/video/mmp/hw/mmp_ctrl.c +0 -1
index 4bd31b2..c46bf5a 100644
@@ -566,7 +566,6 @@ failed:
 		devm_kfree(ctrl->dev, ctrl);
 	}
 
-	platform_set_drvdata(pdev, NULL);
 	dev_err(&pdev->dev, "device init failed\n");
 
 	return ret;
drivers/video/mxsfb.c +0 -2
index 21223d4..10210a0 100644
@@ -986,8 +986,6 @@ static int mxsfb_remove(struct platform_device *pdev)
 
 	framebuffer_release(fb_info);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
drivers/video/nuc900fb.c +0 -1
index 32581c7..8c527e5 100644
@@ -707,7 +707,6 @@ static int nuc900fb_remove(struct platform_device *pdev)
 	release_resource(fbi->mem);
 	kfree(fbi->mem);
 
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(fbinfo);
 
 	return 0;
drivers/video/pxa3xx-gcu.c +0 -2
index 97563c5..95c3c4ae 100644
@@ -711,7 +711,6 @@ err_misc_deregister:
 	misc_deregister(&priv->misc_dev);
 
 err_free_priv:
-	platform_set_drvdata(dev, NULL);
 	free_buffers(dev, priv);
 	kfree(priv);
 	return ret;

@@ -729,7 +728,6 @@ static int pxa3xx_gcu_remove(struct platform_device *dev)
 			priv->shared, priv->shared_phys);
 	iounmap(priv->mmio_base);
 	release_mem_region(r->start, resource_size(r));
-	platform_set_drvdata(dev, NULL);
 	clk_disable(priv->clk);
 	free_buffers(dev, priv);
 	kfree(priv);
drivers/video/pxafb.c +0 -1
index 580f80c..eca2de4 100644
@@ -2256,7 +2256,6 @@ failed_free_res:
 	release_mem_region(r->start, resource_size(r));
 failed_fbi:
 	clk_put(fbi->clk);
-	platform_set_drvdata(dev, NULL);
 	kfree(fbi);
 failed:
 	return ret;
drivers/video/s3c2410fb.c +0 -2
index 76a0e7f..21a32ad 100644
@@ -1005,7 +1005,6 @@ release_regs:
 release_mem:
 	release_mem_region(res->start, size);
 dealloc_fb:
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(fbinfo);
 	return ret;
 }

@@ -1051,7 +1050,6 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
 	release_mem_region(info->mem->start, resource_size(info->mem));
 
-	platform_set_drvdata(pdev, NULL);
 	framebuffer_release(fbinfo);
 
 	return 0;
drivers/video/sa1100fb.c +0 -1
index f34c858..de76da0 100644
@@ -1271,7 +1271,6 @@ static int sa1100fb_probe(struct platform_device *pdev)
  failed:
 	if (fbi)
 		iounmap(fbi->base);
-	platform_set_drvdata(pdev, NULL);
 	kfree(fbi);
 	release_mem_region(res->start, resource_size(res));
 	return ret;
drivers/video/sh7760fb.c +0 -1
index 5fbb0c7..a8c6c43 100644
@@ -571,7 +571,6 @@ static int sh7760fb_remove(struct platform_device *dev)
 	iounmap(par->base);
 	release_mem_region(par->ioarea->start, resource_size(par->ioarea));
 	framebuffer_release(info);
-	platform_set_drvdata(dev, NULL);
 
 	return 0;
 }
drivers/video/sh_mipi_dsi.c +0 -1
index 6cad530..8f6e8ff 100644
@@ -567,7 +567,6 @@ static int sh_mipi_remove(struct platform_device *pdev)
 	iounmap(mipi->base);
 	if (res)
 		release_mem_region(res->start, resource_size(res));
-	platform_set_drvdata(pdev, NULL);
 	kfree(mipi);
 
 	return 0;
drivers/video/tmiofb.c +0 -3
index dc4fb86..deb8733 100644
@@ -794,7 +794,6 @@ err_hw_init:
 		cell->disable(dev);
 err_enable:
 err_find_mode:
-	platform_set_drvdata(dev, NULL);
 	free_irq(irq, info);
 err_request_irq:
 	iounmap(info->screen_base);

@@ -823,8 +822,6 @@ static int tmiofb_remove(struct platform_device *dev)
 		if (cell->disable)
 			cell->disable(dev);
 
-		platform_set_drvdata(dev, NULL);
-
 		free_irq(irq, info);
 
 		iounmap(info->screen_base);
drivers/video/vga16fb.c +0 -1
index 545faec..830ded4 100644
@@ -1269,7 +1269,6 @@ static void vga16fb_destroy(struct fb_info *info)
 	iounmap(info->screen_base);
 	fb_dealloc_cmap(&info->cmap);
 	/* XXX unshare VGA regions */
-	platform_set_drvdata(dev, NULL);
 	framebuffer_release(info);
 }
drivers/video/vt8500lcdfb.c +0 -1
index 9547e18..897484903 100644
@@ -448,7 +448,6 @@ failed_free_io:
 failed_free_res:
 	release_mem_region(res->start, resource_size(res));
 failed_fbi:
-	platform_set_drvdata(pdev, NULL);
 	kfree(fbi);
 failed:
 	return ret;
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 10 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by Jingoo Han <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Acked-by Kuninori Morimoto <[email protected]>
Acked-by Shawn Guo <[email protected]>
Reviewed-by H Hartley Sweeten <[email protected]>

I've added this to my fbdev-3.11 branch.

Tomi