mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 19:26:01 -04:00
Merge tag 'linux-cpupower-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower utility updates for v5.8-rc1 from Shuah Khan: "This cpupower update for Linux 5.8-rc1 consists of a single patch to fix coccicheck unneeded semicolon warning." * tag 'linux-cpupower-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux: cpupower: Remove unneeded semicolon
This commit is contained in:
@@ -62,7 +62,7 @@ int cmd_info(int argc, char **argv)
|
||||
default:
|
||||
print_wrong_arg_exit();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if (!params.params)
|
||||
params.params = 0x7;
|
||||
|
||||
@@ -72,7 +72,7 @@ int cmd_set(int argc, char **argv)
|
||||
default:
|
||||
print_wrong_arg_exit();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if (!params.params)
|
||||
print_wrong_arg_exit();
|
||||
|
||||
@@ -117,7 +117,7 @@ static int amd_fam14h_get_pci_info(struct cstate *state,
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ static int cpuidle_start(void)
|
||||
dprint("CPU %d - State: %d - Val: %llu\n",
|
||||
cpu, state, previous_count[cpu][state]);
|
||||
}
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ static int cpuidle_stop(void)
|
||||
dprint("CPU %d - State: %d - Val: %llu\n",
|
||||
cpu, state, previous_count[cpu][state]);
|
||||
}
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ static struct cpuidle_monitor *cpuidle_register(void)
|
||||
cpuidle_cstates[num].id = num;
|
||||
cpuidle_cstates[num].get_count_percent =
|
||||
cpuidle_get_count_percent;
|
||||
};
|
||||
}
|
||||
|
||||
/* Free this at program termination */
|
||||
previous_count = malloc(sizeof(long long *) * cpu_count);
|
||||
|
||||
@@ -79,7 +79,7 @@ static int hsw_ext_get_count(enum intel_hsw_ext_id id, unsigned long long *val,
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
if (read_msr(cpu, msr, val))
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
@@ -91,7 +91,7 @@ static int nhm_get_count(enum intel_nhm_id id, unsigned long long *val,
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
if (read_msr(cpu, msr, val))
|
||||
return -1;
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ static int snb_get_count(enum intel_snb_id id, unsigned long long *val,
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
if (read_msr(cpu, msr, val))
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user