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

Merge tag 'hwmon-for-linus-v4.7-rc3' of...

Merge tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - fix regression in fam15h_power driver

 - minor variable type fix in lm90 driver

 - document compatible statement for ina2xx driver

* tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (lm90) use proper type for update_interval
  hwmon: (ina2xx) Document compatible for INA231
  hwmon: (fam15h_power) Disable preemption when reading registers
parents f5364c15 38bab98a
...@@ -7,6 +7,7 @@ Required properties: ...@@ -7,6 +7,7 @@ Required properties:
- "ti,ina220" for ina220 - "ti,ina220" for ina220
- "ti,ina226" for ina226 - "ti,ina226" for ina226
- "ti,ina230" for ina230 - "ti,ina230" for ina230
- "ti,ina231" for ina231
- reg: I2C address - reg: I2C address
Optional properties: Optional properties:
......
...@@ -172,9 +172,9 @@ static void do_read_registers_on_cu(void *_data) ...@@ -172,9 +172,9 @@ static void do_read_registers_on_cu(void *_data)
*/ */
static int read_registers(struct fam15h_power_data *data) static int read_registers(struct fam15h_power_data *data)
{ {
int this_cpu, ret, cpu;
int core, this_core; int core, this_core;
cpumask_var_t mask; cpumask_var_t mask;
int ret, cpu;
ret = zalloc_cpumask_var(&mask, GFP_KERNEL); ret = zalloc_cpumask_var(&mask, GFP_KERNEL);
if (!ret) if (!ret)
...@@ -183,7 +183,6 @@ static int read_registers(struct fam15h_power_data *data) ...@@ -183,7 +183,6 @@ static int read_registers(struct fam15h_power_data *data)
memset(data->cu_on, 0, sizeof(int) * MAX_CUS); memset(data->cu_on, 0, sizeof(int) * MAX_CUS);
get_online_cpus(); get_online_cpus();
this_cpu = smp_processor_id();
/* /*
* Choose the first online core of each compute unit, and then * Choose the first online core of each compute unit, and then
...@@ -205,12 +204,9 @@ static int read_registers(struct fam15h_power_data *data) ...@@ -205,12 +204,9 @@ static int read_registers(struct fam15h_power_data *data)
cpumask_set_cpu(cpumask_any(topology_sibling_cpumask(cpu)), mask); cpumask_set_cpu(cpumask_any(topology_sibling_cpumask(cpu)), mask);
} }
if (cpumask_test_cpu(this_cpu, mask)) on_each_cpu_mask(mask, do_read_registers_on_cu, data, true);
do_read_registers_on_cu(data);
smp_call_function_many(mask, do_read_registers_on_cu, data, true);
put_online_cpus(); put_online_cpus();
free_cpumask_var(mask); free_cpumask_var(mask);
return 0; return 0;
......
...@@ -375,7 +375,7 @@ struct lm90_data { ...@@ -375,7 +375,7 @@ struct lm90_data {
int kind; int kind;
u32 flags; u32 flags;
int update_interval; /* in milliseconds */ unsigned int update_interval; /* in milliseconds */
u8 config_orig; /* Original configuration register value */ u8 config_orig; /* Original configuration register value */
u8 convrate_orig; /* Original conversion rate register value */ u8 convrate_orig; /* Original conversion rate register value */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment