Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (k8temp) Remove superfluous CPU family check

The family check in k8temp is not required because the driver is
already bound to a northbridge device only used with K8 CPUs.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

Andreas Herrmann and committed by
Jean Delvare
628b4504 81280572

+23 -30
+23 -30
drivers/hwmon/k8temp.c
··· 191 191 model = boot_cpu_data.x86_model; 192 192 stepping = boot_cpu_data.x86_mask; 193 193 194 - switch (boot_cpu_data.x86) { 195 - case 0xf: 196 - /* feature available since SH-C0, exclude older revisions */ 197 - if (((model == 4) && (stepping == 0)) || 198 - ((model == 5) && (stepping <= 1))) { 199 - err = -ENODEV; 200 - goto exit_free; 201 - } 202 - 203 - /* 204 - * AMD NPT family 0fh, i.e. RevF and RevG: 205 - * meaning of SEL_CORE bit is inverted 206 - */ 207 - if (model >= 0x40) { 208 - data->swap_core_select = 1; 209 - dev_warn(&pdev->dev, "Temperature readouts might be " 210 - "wrong - check erratum #141\n"); 211 - } 212 - 213 - if (is_rev_g_desktop(model)) { 214 - /* 215 - * RevG desktop CPUs (i.e. no socket S1G1 or 216 - * ASB1 parts) need additional offset, 217 - * otherwise reported temperature is below 218 - * ambient temperature 219 - */ 220 - data->temp_offset = 21000; 221 - } 222 - 223 - break; 194 + /* feature available since SH-C0, exclude older revisions */ 195 + if (((model == 4) && (stepping == 0)) || 196 + ((model == 5) && (stepping <= 1))) { 197 + err = -ENODEV; 198 + goto exit_free; 224 199 } 200 + 201 + /* 202 + * AMD NPT family 0fh, i.e. RevF and RevG: 203 + * meaning of SEL_CORE bit is inverted 204 + */ 205 + if (model >= 0x40) { 206 + data->swap_core_select = 1; 207 + dev_warn(&pdev->dev, "Temperature readouts might be wrong - " 208 + "check erratum #141\n"); 209 + } 210 + 211 + /* 212 + * RevG desktop CPUs (i.e. no socket S1G1 or ASB1 parts) need 213 + * additional offset, otherwise reported temperature is below 214 + * ambient temperature 215 + */ 216 + if (is_rev_g_desktop(model)) 217 + data->temp_offset = 21000; 225 218 226 219 pci_read_config_byte(pdev, REG_TEMP, &scfg); 227 220 scfg &= ~(SEL_PLACE | SEL_CORE); /* Select sensor 0, core0 */