Skip to content

Commit 5ed909b

Browse files
committed
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
2 parents 9cb1fd0 + 7b0bf99 commit 5ed909b

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

tools/power/cpupower/utils/cpupower-info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int cmd_info(int argc, char **argv)
6262
default:
6363
print_wrong_arg_exit();
6464
}
65-
};
65+
}
6666

6767
if (!params.params)
6868
params.params = 0x7;

tools/power/cpupower/utils/cpupower-set.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int cmd_set(int argc, char **argv)
7272
default:
7373
print_wrong_arg_exit();
7474
}
75-
};
75+
}
7676

7777
if (!params.params)
7878
print_wrong_arg_exit();

tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int amd_fam14h_get_pci_info(struct cstate *state,
117117
break;
118118
default:
119119
return -1;
120-
};
120+
}
121121
return 0;
122122
}
123123

tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static int cpuidle_start(void)
5353
dprint("CPU %d - State: %d - Val: %llu\n",
5454
cpu, state, previous_count[cpu][state]);
5555
}
56-
};
56+
}
5757
return 0;
5858
}
5959

@@ -72,7 +72,7 @@ static int cpuidle_stop(void)
7272
dprint("CPU %d - State: %d - Val: %llu\n",
7373
cpu, state, previous_count[cpu][state]);
7474
}
75-
};
75+
}
7676
return 0;
7777
}
7878

@@ -172,7 +172,7 @@ static struct cpuidle_monitor *cpuidle_register(void)
172172
cpuidle_cstates[num].id = num;
173173
cpuidle_cstates[num].get_count_percent =
174174
cpuidle_get_count_percent;
175-
};
175+
}
176176

177177
/* Free this at program termination */
178178
previous_count = malloc(sizeof(long long *) * cpu_count);

tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static int hsw_ext_get_count(enum intel_hsw_ext_id id, unsigned long long *val,
7979
break;
8080
default:
8181
return -1;
82-
};
82+
}
8383
if (read_msr(cpu, msr, val))
8484
return -1;
8585
return 0;

tools/power/cpupower/utils/idle_monitor/nhm_idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static int nhm_get_count(enum intel_nhm_id id, unsigned long long *val,
9191
break;
9292
default:
9393
return -1;
94-
};
94+
}
9595
if (read_msr(cpu, msr, val))
9696
return -1;
9797

tools/power/cpupower/utils/idle_monitor/snb_idle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static int snb_get_count(enum intel_snb_id id, unsigned long long *val,
7777
break;
7878
default:
7979
return -1;
80-
};
80+
}
8181
if (read_msr(cpu, msr, val))
8282
return -1;
8383
return 0;

0 commit comments

Comments
 (0)