Merge tag 'x86_microcode_for_v6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / platform / x86 / intel / ifs / load.c

diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c
index 959b187..a1ee1a7 100644 (file)
--- a/drivers/platform/x86/intel/ifs/load.c
+++ b/drivers/platform/x86/intel/ifs/load.c
@@ -349,7 +349,7 @@ out:
 
 static int image_sanity_check(struct device *dev, const struct microcode_header_intel *data)
 {
-       struct ucode_cpu_info uci;
+       struct cpu_signature sig;
 
        /* Provide a specific error message when loading an older/unsupported image */
        if (data->hdrver != MC_HEADER_TYPE_IFS) {
@@ -362,11 +362,9 @@ static int image_sanity_check(struct device *dev, const struct microcode_header_
                return -EINVAL;
        }
 
-       intel_cpu_collect_info(&uci);
+       intel_collect_cpu_info(&sig);
 
-       if (!intel_find_matching_signature((void *)data,
-                                          uci.cpu_sig.sig,
-                                          uci.cpu_sig.pf)) {
+       if (!intel_find_matching_signature((void *)data, &sig)) {
                dev_err(dev, "cpu signature, processor flags not matching\n");
                return -EINVAL;
        }