@@ -205,24 +205,21 @@ impl super::Cpuid {
205
205
. checked_shl ( u32:: from ( cpu_bits) )
206
206
. ok_or ( NormalizeCpuidError :: CpuBits ( cpu_bits) ) ?;
207
207
self . update_vendor_id ( ) ?;
208
- self . update_feature_info_entry ( cpu_index, cpu_count)
209
- . map_err ( NormalizeCpuidError :: FeatureInformation ) ?;
210
- self . update_extended_topology_entry ( cpu_index, cpu_count, cpu_bits, cpus_per_core)
211
- . map_err ( NormalizeCpuidError :: ExtendedTopology ) ?;
212
- self . update_extended_cache_features ( )
213
- . map_err ( NormalizeCpuidError :: ExtendedCacheFeatures ) ?;
208
+ self . update_feature_info_entry ( cpu_index, cpu_count) ?;
209
+ self . update_extended_topology_entry ( cpu_index, cpu_count, cpu_bits, cpus_per_core) ?;
210
+ self . update_extended_cache_features ( ) ?;
214
211
215
212
// Apply manufacturer specific modifications.
216
213
match self {
217
214
// Apply Intel specific modifications.
218
- Self :: Intel ( intel_cpuid) => intel_cpuid
219
- . normalize ( cpu_index, cpu_count, cpus_per_core)
220
- . map_err ( NormalizeCpuidError :: Intel ) ,
215
+ Self :: Intel ( intel_cpuid) => {
216
+ intel_cpuid . normalize ( cpu_index, cpu_count, cpus_per_core) ? ;
217
+ }
221
218
// Apply AMD specific modifications.
222
- Self :: Amd ( amd_cpuid) => amd_cpuid
223
- . normalize ( cpu_index, cpu_count, cpus_per_core)
224
- . map_err ( NormalizeCpuidError :: Amd ) ,
219
+ Self :: Amd ( amd_cpuid) => amd_cpuid. normalize ( cpu_index, cpu_count, cpus_per_core) ?,
225
220
}
221
+
222
+ Ok ( ( ) )
226
223
}
227
224
228
225
/// Pass-through the vendor ID from the host. This is used to prevent modification of the vendor
0 commit comments