platform/x86: amd-pmc: Move to later in the suspend process

[linux.git] / drivers / platform / x86 / intel / pmt / class.c

diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
index 659b1073033c2e300e7b9e78ebfa9c153d9fbb90..1c9e3f3ea41c51b452e44d82dbd1caa9b217be00 100644 (file)
--- a/drivers/platform/x86/intel/pmt/class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -13,6 +13,7 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 
+#include "../vsec.h"
 #include "class.h"
 
 #define PMT_XA_START           0
@@ -281,31 +282,29 @@ fail_dev_create:
        return ret;
 }
 
-int intel_pmt_dev_create(struct intel_pmt_entry *entry,
-                        struct intel_pmt_namespace *ns,
-                        struct platform_device *pdev, int idx)
+int intel_pmt_dev_create(struct intel_pmt_entry *entry, struct intel_pmt_namespace *ns,
+                        struct intel_vsec_device *intel_vsec_dev, int idx)
 {
+       struct device *dev = &intel_vsec_dev->auxdev.dev;
        struct intel_pmt_header header;
        struct resource *disc_res;
-       int ret = -ENODEV;
+       int ret;
 
-       disc_res = platform_get_resource(pdev, IORESOURCE_MEM, idx);
-       if (!disc_res)
-               return ret;
+       disc_res = &intel_vsec_dev->resource[idx];
 
-       entry->disc_table = devm_platform_ioremap_resource(pdev, idx);
+       entry->disc_table = devm_ioremap_resource(dev, disc_res);
        if (IS_ERR(entry->disc_table))
                return PTR_ERR(entry->disc_table);
 
-       ret = ns->pmt_header_decode(entry, &header, &pdev->dev);
+       ret = ns->pmt_header_decode(entry, &header, dev);
        if (ret)
                return ret;
 
-       ret = intel_pmt_populate_entry(entry, &header, &pdev->dev, disc_res);
+       ret = intel_pmt_populate_entry(entry, &header, dev, disc_res);
        if (ret)
                return ret;
 
-       return intel_pmt_dev_register(entry, ns, &pdev->dev);
+       return intel_pmt_dev_register(entry, ns, dev);
 
 }
 EXPORT_SYMBOL_GPL(intel_pmt_dev_create);