hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macintosh: change some data types from int to bool 

Change the data type of the following variables from int to bool
across all macintosh drivers:

started
slots_started
pm121_started
wf_smu_started

Some of these issues were detected with the help of Coccinelle.

Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Gustavo A. R. Silva 2018-01-23 19:42:28 -06:00 committed by Michael Ellerman
parent 0bc0091401
commit 4f256d5614
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/macintosh/therm_adt746x.c
View File

@ -230,7 +230,7 @@ static void update_fans_speed (struct thermostat *th)
/* we don't care about local sensor, so we start at sensor 1 */ /* we don't care about local sensor, so we start at sensor 1 */
for (i = 1; i < 3; i++) { for (i = 1; i < 3; i++) {
int started = 0; bool started = false;
int fan_number = (th->type == ADT7460 && i == 2); int fan_number = (th->type == ADT7460 && i == 2);
int var = th->temps[i] - th->limits[i]; int var = th->temps[i] - th->limits[i];
@ -243,7 +243,7 @@ static void update_fans_speed (struct thermostat *th)
if (abs(var - th->last_var[fan_number]) < 2) if (abs(var - th->last_var[fan_number]) < 2)
continue; continue;
started = 1; started = true;
new_speed = fan_speed + ((var-1)*step); new_speed = fan_speed + ((var-1)*step);
if (new_speed < fan_speed) if (new_speed < fan_speed)

8
drivers/macintosh/windfarm_pm112.c
View File

@ -96,14 +96,14 @@ static int cpu_last_target;
static struct wf_pid_state backside_pid; static struct wf_pid_state backside_pid;
static int backside_tick; static int backside_tick;
static struct wf_pid_state slots_pid; static struct wf_pid_state slots_pid;
static int slots_started; static bool slots_started;
static struct wf_pid_state drive_bay_pid; static struct wf_pid_state drive_bay_pid;
static int drive_bay_tick; static int drive_bay_tick;
static int nr_cores; static int nr_cores;
static int have_all_controls; static int have_all_controls;
static int have_all_sensors; static int have_all_sensors;
static int started; static bool started;
static int failure_state; static int failure_state;
#define FAILURE_SENSOR 1 #define FAILURE_SENSOR 1
@ -462,7 +462,7 @@ static void slots_fan_tick(void)
/* first time; initialize things */ /* first time; initialize things */
printk(KERN_INFO "windfarm: Slots control loop started.\n"); printk(KERN_INFO "windfarm: Slots control loop started.\n");
wf_pid_init(&slots_pid, &slots_param); wf_pid_init(&slots_pid, &slots_param);
slots_started = 1; slots_started = true;
} }
err = slots_power->ops->get_value(slots_power, &power); err = slots_power->ops->get_value(slots_power, &power);
@ -506,7 +506,7 @@ static void pm112_tick(void)
int i, last_failure; int i, last_failure;
if (!started) { if (!started) {
started = 1; started = true;
printk(KERN_INFO "windfarm: CPUs control loops started.\n"); printk(KERN_INFO "windfarm: CPUs control loops started.\n");
for (i = 0; i < nr_cores; ++i) { for (i = 0; i < nr_cores; ++i) {
if (create_cpu_loop(i) < 0) { if (create_cpu_loop(i) < 0) {

5
drivers/macintosh/windfarm_pm121.c
View File

@ -246,7 +246,8 @@ enum {
static struct wf_control *controls[N_CONTROLS] = {}; static struct wf_control *controls[N_CONTROLS] = {};
/* Set to kick the control loop into life */ /* Set to kick the control loop into life */
static int pm121_all_controls_ok, pm121_all_sensors_ok, pm121_started; static int pm121_all_controls_ok, pm121_all_sensors_ok;
static bool pm121_started;
enum { enum {
FAILURE_FAN = 1 << 0, FAILURE_FAN = 1 << 0,
@ -806,7 +807,7 @@ static void pm121_tick(void)
pm121_create_sys_fans(i); pm121_create_sys_fans(i);
pm121_create_cpu_fans(); pm121_create_cpu_fans();
pm121_started = 1; pm121_started = true;
} }
/* skipping ticks */ /* skipping ticks */

2
drivers/macintosh/windfarm_pm72.c
View File

@ -611,7 +611,7 @@ static void pm72_tick(void)
int i, last_failure; int i, last_failure;
if (!started) { if (!started) {
started = 1; started = true;
printk(KERN_INFO "windfarm: CPUs control loops started.\n"); printk(KERN_INFO "windfarm: CPUs control loops started.\n");
for (i = 0; i < nr_chips; ++i) { for (i = 0; i < nr_chips; ++i) {
if (cpu_setup_pid(i) < 0) { if (cpu_setup_pid(i) < 0) {

5
drivers/macintosh/windfarm_pm81.c
View File

@ -140,7 +140,8 @@ static struct wf_control *fan_system;
static struct wf_control *cpufreq_clamp; static struct wf_control *cpufreq_clamp;
/* Set to kick the control loop into life */ /* Set to kick the control loop into life */
static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok, wf_smu_started; static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok;
static bool wf_smu_started;
/* Failure handling.. could be nicer */ /* Failure handling.. could be nicer */
#define FAILURE_FAN 0x01 #define FAILURE_FAN 0x01
@ -549,7 +550,7 @@ static void wf_smu_tick(void)
DBG("wf: creating control loops !\n"); DBG("wf: creating control loops !\n");
wf_smu_create_sys_fans(); wf_smu_create_sys_fans();
wf_smu_create_cpu_fans(); wf_smu_create_cpu_fans();
wf_smu_started = 1; wf_smu_started = true;
} }
/* Skipping ticks */ /* Skipping ticks */

5
drivers/macintosh/windfarm_pm91.c
View File

@ -75,7 +75,8 @@ static struct wf_control *fan_slots;
static struct wf_control *cpufreq_clamp; static struct wf_control *cpufreq_clamp;
/* Set to kick the control loop into life */ /* Set to kick the control loop into life */
static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok, wf_smu_started; static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok;
static bool wf_smu_started;
static bool wf_smu_overtemp; static bool wf_smu_overtemp;
/* Failure handling.. could be nicer */ /* Failure handling.. could be nicer */
@ -467,7 +468,7 @@ static void wf_smu_tick(void)
wf_smu_create_drive_fans(); wf_smu_create_drive_fans();
wf_smu_create_slots_fans(); wf_smu_create_slots_fans();
wf_smu_create_cpu_fans(); wf_smu_create_cpu_fans();
wf_smu_started = 1; wf_smu_started = true;
} }
/* Skipping ticks */ /* Skipping ticks */

2
drivers/macintosh/windfarm_rm31.c
View File

@ -514,7 +514,7 @@ static void rm31_tick(void)
int i, last_failure; int i, last_failure;
if (!started) { if (!started) {
started = 1; started = true;
printk(KERN_INFO "windfarm: CPUs control loops started.\n"); printk(KERN_INFO "windfarm: CPUs control loops started.\n");
for (i = 0; i < nr_chips; ++i) { for (i = 0; i < nr_chips; ++i) {
if (cpu_setup_pid(i) < 0) { if (cpu_setup_pid(i) < 0) {