Skip to contentSkip to conversation

dma: at_hdmac: remove unnecessary platform_set_drvdata()

PATCH Applied Jingoo Han 3 participants 3 messages May 6, 2013 – May 27, 2013

Subsystems (2)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/2 dma: at_hdmac: 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.

---
 drivers/dma/at_hdmac.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/dma/at_hdmac.c +0 -2
index e923cda..c093ab7 100644
@@ -1472,7 +1472,6 @@ err_of_dma_controller_register:
 	dma_async_device_unregister(&atdma->dma_common);
 	dma_pool_destroy(atdma->dma_desc_pool);
 err_pool_create:
-	platform_set_drvdata(pdev, NULL);
 	free_irq(platform_get_irq(pdev, 0), atdma);
 err_irq:
 	clk_disable(atdma->clk);
@@ -1497,7 +1496,6 @@ static int at_dma_remove(struct platform_device *pdev)
 	dma_async_device_unregister(&atdma->dma_common);
 
 	dma_pool_destroy(atdma->dma_desc_pool);
-	platform_set_drvdata(pdev, NULL);
 	free_irq(platform_get_irq(pdev, 0), atdma);
 
 	list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
Signature · 1 line
1.7.2.5
Acked-by on v1 1/2
#1 lore raw

On 06/05/2013 05:53, Jingoo Han :

Quoted 6 lines

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.

Quoted 25 lines
---
  drivers/dma/at_hdmac.c |    2 --
  1 files changed, 0 insertions(+), 2 deletions(-)
drivers/dma/at_hdmac.c +0 -2
index e923cda..c093ab7 100644
@@ -1472,7 +1472,6 @@ err_of_dma_controller_register:
  	dma_async_device_unregister(&atdma->dma_common);
  	dma_pool_destroy(atdma->dma_desc_pool);
  err_pool_create:
-	platform_set_drvdata(pdev, NULL);
  	free_irq(platform_get_irq(pdev, 0), atdma);
  err_irq:
  	clk_disable(atdma->clk);
@@ -1497,7 +1496,6 @@ static int at_dma_remove(struct platform_device *pdev)
  	dma_async_device_unregister(&atdma->dma_common);
 
  	dma_pool_destroy(atdma->dma_desc_pool);
-	platform_set_drvdata(pdev, NULL);
  	free_irq(platform_get_irq(pdev, 0), atdma);
 
  	list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
Signature · 1 line
Nicolas Ferre
Applied
#2 lore raw
In reply to Jingoo Han
Quoted 6 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.

Applied both, Thanks

--
~Vinod

Quoted 27 lines
---
 drivers/dma/at_hdmac.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/dma/at_hdmac.c +0 -2
index e923cda..c093ab7 100644
@@ -1472,7 +1472,6 @@ err_of_dma_controller_register:
 	dma_async_device_unregister(&atdma->dma_common);
 	dma_pool_destroy(atdma->dma_desc_pool);
 err_pool_create:
-	platform_set_drvdata(pdev, NULL);
 	free_irq(platform_get_irq(pdev, 0), atdma);
 err_irq:
 	clk_disable(atdma->clk);
@@ -1497,7 +1496,6 @@ static int at_dma_remove(struct platform_device *pdev)
 	dma_async_device_unregister(&atdma->dma_common);
 
 	dma_pool_destroy(atdma->dma_desc_pool);
-	platform_set_drvdata(pdev, NULL);
 	free_irq(platform_get_irq(pdev, 0), atdma);
 
 	list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
Signature · 1 line
1.7.2.5