diff options
-rw-r--r-- | drivers/iommu/omap-iommu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 2ba321921f81..839cd8bc9aaf 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c | |||
@@ -170,7 +170,7 @@ static int iommu_enable(struct omap_iommu *obj) | |||
170 | { | 170 | { |
171 | int err; | 171 | int err; |
172 | struct platform_device *pdev = to_platform_device(obj->dev); | 172 | struct platform_device *pdev = to_platform_device(obj->dev); |
173 | struct iommu_platform_data *pdata = pdev->dev.platform_data; | 173 | struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev); |
174 | 174 | ||
175 | if (pdata && pdata->deassert_reset) { | 175 | if (pdata && pdata->deassert_reset) { |
176 | err = pdata->deassert_reset(pdev, pdata->reset_name); | 176 | err = pdata->deassert_reset(pdev, pdata->reset_name); |
@@ -190,7 +190,7 @@ static int iommu_enable(struct omap_iommu *obj) | |||
190 | static void iommu_disable(struct omap_iommu *obj) | 190 | static void iommu_disable(struct omap_iommu *obj) |
191 | { | 191 | { |
192 | struct platform_device *pdev = to_platform_device(obj->dev); | 192 | struct platform_device *pdev = to_platform_device(obj->dev); |
193 | struct iommu_platform_data *pdata = pdev->dev.platform_data; | 193 | struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev); |
194 | 194 | ||
195 | omap2_iommu_disable(obj); | 195 | omap2_iommu_disable(obj); |
196 | 196 | ||
@@ -1007,7 +1007,7 @@ static int omap_iommu_probe(struct platform_device *pdev) | |||
1007 | int irq; | 1007 | int irq; |
1008 | struct omap_iommu *obj; | 1008 | struct omap_iommu *obj; |
1009 | struct resource *res; | 1009 | struct resource *res; |
1010 | struct iommu_platform_data *pdata = pdev->dev.platform_data; | 1010 | struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev); |
1011 | struct device_node *of = pdev->dev.of_node; | 1011 | struct device_node *of = pdev->dev.of_node; |
1012 | 1012 | ||
1013 | obj = devm_kzalloc(&pdev->dev, sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL); | 1013 | obj = devm_kzalloc(&pdev->dev, sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL); |