Commit ddf8a0d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (w83627ehf) Fix broken driver init
  hwmon: (coretemp) Fix for non-SMP builds
parents 99913572 bfa02b0d

drivers/hwmon/coretemp.c

+1 −2
Original line number Diff line number Diff line
@@ -60,14 +60,13 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); 
#ifdef CONFIG_SMP

#define TO_PHYS_ID(cpu)		cpu_data(cpu).phys_proc_id

#define TO_CORE_ID(cpu)		cpu_data(cpu).cpu_core_id

#define TO_ATTR_NO(cpu)		(TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)

#define for_each_sibling(i, cpu)	for_each_cpu(i, cpu_sibling_mask(cpu))

#else

#define TO_PHYS_ID(cpu)		(cpu)

#define TO_CORE_ID(cpu)		(cpu)

#define TO_ATTR_NO(cpu)		(cpu)

#define for_each_sibling(i, cpu)	for (i = 0; false; )

#endif

#define TO_ATTR_NO(cpu)		(TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)



/*

 * Per-Core Temperature Data

drivers/hwmon/w83627ehf.c

+6 −3
Original line number Diff line number Diff line
@@ -1835,12 +1835,15 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, 
		diode = 0x70;

	}

	for (i = 0; i < 3; i++) {

		const char *label = data->temp_label[data->temp_src[i]];

		const char *label = NULL;



		if (data->temp_label)

			label = data->temp_label[data->temp_src[i]];



		/* Digital source overrides analog type */

		if (strncmp(label, "PECI", 4) == 0)

		if (label && strncmp(label, "PECI", 4) == 0)

			data->temp_type[i] = 6;

		else if (strncmp(label, "AMD", 3) == 0)

		else if (label && strncmp(label, "AMD", 3) == 0)

			data->temp_type[i] = 5;

		else if ((tmp & (0x02 << i)))

			data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;