iommu/arm-smmu: fix iommu_present() test in init

[karo-tx-linux.git] / drivers / mfd / intel_msic.c

diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
index 4f2462f0963e6fac016f6cacbf917a012870eb46..9203d47cdbb1b4106e87ba91e4571cea54c55543 100644 (file)
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel_msic.c
@@ -310,7 +310,7 @@ EXPORT_SYMBOL_GPL(intel_msic_irq_read);
 static int intel_msic_init_devices(struct intel_msic *msic)
 {
        struct platform_device *pdev = msic->pdev;
-       struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
+       struct intel_msic_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int ret, i;
 
        if (pdata->gpio) {
@@ -372,7 +372,7 @@ static void intel_msic_remove_devices(struct intel_msic *msic)
 
 static int intel_msic_probe(struct platform_device *pdev)
 {
-       struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
+       struct intel_msic_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct intel_msic *msic;
        struct resource *res;
        u8 id0, id1;