Skip to contentSkip to conversation

iommu: remove unnecessary platform_set_drvdata()

PATCH In review Jingoo Han 4 participants 5 messages Aug 22, 2013 – Sep 25, 2013

Subsystems (3)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 iommu: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/iommu/msm_iommu_dev.c |    2 --
 drivers/iommu/omap-iommu.c    |    2 --
 2 files changed, 4 deletions(-)
drivers/iommu/msm_iommu_dev.c +0 -2
index 0a1c962..08ba497 100644
@@ -282,7 +282,6 @@ static int msm_iommu_remove(struct platform_device *pdev)
 		clk_put(drv->pclk);
 		memset(drv, 0, sizeof(*drv));
 		kfree(drv);
-		platform_set_drvdata(pdev, NULL);
 	}
 	return 0;
 }
@@ -366,7 +365,6 @@ static int msm_iommu_ctx_remove(struct platform_device *pdev)
 	if (drv) {
 		memset(drv, 0, sizeof(struct msm_iommu_ctx_drvdata));
 		kfree(drv);
-		platform_set_drvdata(pdev, NULL);
 	}
 	return 0;
 }
drivers/iommu/omap-iommu.c +0 -2
index 0ba3766..bcd78a7 100644
@@ -1008,8 +1008,6 @@ static int omap_iommu_remove(struct platform_device *pdev)
 	struct resource *res;
 	struct omap_iommu *obj = platform_get_drvdata(pdev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	iopgtable_clear_entry_all(obj);
 
 	irq = platform_get_irq(pdev, 0);
Signature · 1 line
1.7.10.4
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---

It looks good.

Quoted 38 lines
 drivers/iommu/msm_iommu_dev.c |    2 --
 drivers/iommu/omap-iommu.c    |    2 --
 2 files changed, 4 deletions(-)
drivers/iommu/msm_iommu_dev.c +0 -2
index 0a1c962..08ba497 100644
@@ -282,7 +282,6 @@ static int msm_iommu_remove(struct platform_device *pdev)
 		clk_put(drv->pclk);
 		memset(drv, 0, sizeof(*drv));
 		kfree(drv);
-		platform_set_drvdata(pdev, NULL);
 	}
 	return 0;
 }
@@ -366,7 +365,6 @@ static int msm_iommu_ctx_remove(struct platform_device *pdev)
 	if (drv) {
 		memset(drv, 0, sizeof(struct msm_iommu_ctx_drvdata));
 		kfree(drv);
-		platform_set_drvdata(pdev, NULL);
 	}
 	return 0;
 }
drivers/iommu/omap-iommu.c +0 -2
index 0ba3766..bcd78a7 100644
@@ -1008,8 +1008,6 @@ static int omap_iommu_remove(struct platform_device *pdev)
 	struct resource *res;
 	struct omap_iommu *obj = platform_get_drvdata(pdev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	iopgtable_clear_entry_all(obj);
 
 	irq = platform_get_irq(pdev, 0);
maintainer
#2 lore raw
In reply to Jingoo Han
Quoted 3 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

Please split that into two patches, one for msm and one for omap so that I can put them into their respective topic-branches. Also add the Acked-by while you are at it, please.

Thanks,

Joerg

author
#3 lore raw
Quoted 9 lines · Joerg Roedel
Quoted 3 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

Please split that into two patches, one for msm and one for omap so that I can put them into their respective topic-branches. Also add the Acked-by while you are at it, please.

Hi Joerg Roedel,

This patch was already merged to v3.12-rc1 through mm-tree.
Commit: 5e42781 "drivers/iommu: remove unnecessary platform_set_drvdata()"

Thank you for caring. :-)

Best regards,
Jingoo Han

Acked-by on v1 1/1
#4 lore raw
In reply to Jingoo Han
Quoted 7 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
drivers/iommu/msm_iommu_dev.c | 2 --

With the splitting:

Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation