Reports: rename misnamed ops

pstate_single_state and wakeup_single_state have had most of
their names copied from the cstate variant. As the items
displayed by these functions are frequencies and interrupt
sources, rename the functions to pstate_single_freq and
wakeup_single_irq.

Signed-off-by: Tuukka Tikkanen <tuukka.tikkanen@linaro.org>

5 files changed, 18 insertions, 18 deletions

diff --git a/csv_report.c b/csv_report.c
index 245aa8c..ce7a27e 100644
--- a/csv_report.c
+++ b/csv_report.c
@@ -67,7 +67,7 @@ static void csv_pstate_table_footer(void *report_data)
 	printf("\n\n");
 }
 
-static void csv_pstate_single_state(struct cpufreq_pstate *p, void *report_data)
+static void csv_pstate_single_freq(struct cpufreq_pstate *p, void *report_data)
 {
 	printf(",,,%d,", p->freq);
 	printf("%f,", p->min_time == DBL_MAX ? 0. : p->min_time);
@@ -90,7 +90,7 @@ static void csv_wakeup_table_footer(void *report_data)
 	printf("\n\n");
 }
 
-static void csv_wakeup_single_state(struct wakeup_irq *irqinfo, void *report_data)
+static void csv_wakeup_single_irq(struct wakeup_irq *irqinfo, void *report_data)
 {
 	if (irqinfo->id != -1) {
 		printf(",,,%d,%s,%d,%d,%d\n",
@@ -119,13 +119,13 @@ static struct report_ops csv_report_ops = {
 	.pstate_table_header = csv_pstate_table_header,
 	.pstate_table_footer = csv_pstate_table_footer,
 	.pstate_cpu_header = csv_cstate_cpu_header,
-	.pstate_single_state = csv_pstate_single_state,
+	.pstate_single_freq = csv_pstate_single_freq,
 	.pstate_end_cpu = csv_cstate_end_cpu,
 
 	.wakeup_table_header = csv_wakeup_table_header,
 	.wakeup_table_footer = csv_wakeup_table_footer,
 	.wakeup_cpu_header = csv_cstate_cpu_header,
-	.wakeup_single_state = csv_wakeup_single_state,
+	.wakeup_single_irq = csv_wakeup_single_irq,
 	.wakeup_end_cpu = csv_cstate_end_cpu,
 };
 
diff --git a/default_report.c b/default_report.c
index 62f4046..34944b5 100644
--- a/default_report.c
+++ b/default_report.c
@@ -158,7 +158,7 @@ static void default_pstate_cpu_header(const char *cpu, void *report_data)
 	default_cpu_header(cpu, 64);
 }
 
-static void boxless_pstate_single_state(struct cpufreq_pstate *p, void *report_data)
+static void boxless_pstate_single_freq(struct cpufreq_pstate *p, void *report_data)
 {
 	printf("  ");
 	display_factored_freq(p->freq, 8);
@@ -173,7 +173,7 @@ static void boxless_pstate_single_state(struct cpufreq_pstate *p, void *report_d
 	printf("   %5d\n", p->count);
 }
 
-static void default_pstate_single_state(struct cpufreq_pstate *p, void *report_data)
+static void default_pstate_single_freq(struct cpufreq_pstate *p, void *report_data)
 {
 	printf("| ");
 	display_factored_freq(p->freq, 8);
@@ -225,7 +225,7 @@ static void default_wakeup_cpu_header(const char *cpu, void *report_data)
 	default_cpu_header(cpu, 55);
 }
 
-static void boxless_wakeup_single_state(struct wakeup_irq *irqinfo, void *report_data)
+static void boxless_wakeup_single_irq(struct wakeup_irq *irqinfo, void *report_data)
 {
 	if (irqinfo->id != -1) {
 		printf("  %-3d   %-15.15s   %7d   %7d   %7d\n",
@@ -238,7 +238,7 @@ static void boxless_wakeup_single_state(struct wakeup_irq *irqinfo, void *report
 	}
 }
 
-static void default_wakeup_single_state(struct wakeup_irq *irqinfo, void *report_data)
+static void default_wakeup_single_irq(struct wakeup_irq *irqinfo, void *report_data)
 {
 	if (irqinfo->id != -1) {
 		printf("| %-3d | %-15.15s | %7d | %7d | %7d |\n",
@@ -279,13 +279,13 @@ static struct report_ops default_report_ops = {
 	.pstate_table_header = default_pstate_table_header,
 	.pstate_table_footer = default_pstate_table_footer,
 	.pstate_cpu_header = default_pstate_cpu_header,
-	.pstate_single_state = default_pstate_single_state,
+	.pstate_single_freq = default_pstate_single_freq,
 	.pstate_end_cpu = default_end_cpu,
 
 	.wakeup_table_header = default_wakeup_table_header,
 	.wakeup_table_footer = default_wakeup_table_footer,
 	.wakeup_cpu_header = default_wakeup_cpu_header,
-	.wakeup_single_state = default_wakeup_single_state,
+	.wakeup_single_irq = default_wakeup_single_irq,
 	.wakeup_end_cpu = default_end_cpu,
 };
 
@@ -307,13 +307,13 @@ static struct report_ops boxless_report_ops = {
 	.pstate_table_header = boxless_pstate_table_header,
 	.pstate_table_footer = boxless_pstate_table_footer,
 	.pstate_cpu_header = boxless_cpu_header,
-	.pstate_single_state = boxless_pstate_single_state,
+	.pstate_single_freq = boxless_pstate_single_freq,
 	.pstate_end_cpu = boxless_end_cpu,
 
 	.wakeup_table_header = boxless_wakeup_table_header,
 	.wakeup_table_footer = boxless_wakeup_table_footer,
 	.wakeup_cpu_header = boxless_cpu_header,
-	.wakeup_single_state = boxless_wakeup_single_state,
+	.wakeup_single_irq = boxless_wakeup_single_irq,
 	.wakeup_end_cpu = boxless_end_cpu,
 };
 
diff --git a/idlestat.c b/idlestat.c
index 4551f77..3fba423 100644
--- a/idlestat.c
+++ b/idlestat.c
@@ -155,7 +155,7 @@ static int display_pstates(struct report_ops *ops, void *arg, void *baseline, ch
 			cpu_header = true;
 		}
 
-		ops->pstate_single_state(p, report_data);
+		ops->pstate_single_freq(p, report_data);
 	}
 
 	if (cpu_header)
@@ -179,7 +179,7 @@ static int display_wakeup(struct report_ops *ops, void *arg, void *baseline, cha
 			cpu_header = true;
 		}
 
-		ops->wakeup_single_state(irqinfo, report_data);
+		ops->wakeup_single_irq(irqinfo, report_data);
 	}
 
 	if (cpu_header)
diff --git a/report_ops.h b/report_ops.h
index 2c659e3..fcc5e49 100644
--- a/report_ops.h
+++ b/report_ops.h
@@ -23,13 +23,13 @@ struct report_ops {
 	void (*pstate_table_header)(void *);
 	void (*pstate_table_footer)(void *);
 	void (*pstate_cpu_header)(const char *cpu, void *);
-	void (*pstate_single_state)(struct cpufreq_pstate*, void *);
+	void (*pstate_single_freq)(struct cpufreq_pstate*, void *);
 	void (*pstate_end_cpu)(void*);
 
 	void (*wakeup_table_header)(void *);
 	void (*wakeup_table_footer)(void *);
 	void (*wakeup_cpu_header)(const char *cpu, void *);
-	void (*wakeup_single_state)(struct wakeup_irq *irqinfo, void *);
+	void (*wakeup_single_irq)(struct wakeup_irq *irqinfo, void *);
 	void (*wakeup_end_cpu)(void *);
 };
 
diff --git a/reports.c b/reports.c
index 7ce139b..fbe295d 100644
--- a/reports.c
+++ b/reports.c
@@ -58,12 +58,12 @@ struct report_ops *get_report_ops(const char *name)
 		assert((*ops_it)->pstate_table_header);
 		assert((*ops_it)->pstate_table_footer);
 		assert((*ops_it)->pstate_cpu_header);
-		assert((*ops_it)->pstate_single_state);
+		assert((*ops_it)->pstate_single_freq);
 		assert((*ops_it)->pstate_end_cpu);
 		assert((*ops_it)->wakeup_table_header);
 		assert((*ops_it)->wakeup_table_footer);
 		assert((*ops_it)->wakeup_cpu_header);
-		assert((*ops_it)->wakeup_single_state);
+		assert((*ops_it)->wakeup_single_irq);
 		assert((*ops_it)->wakeup_end_cpu);
 		/* Compare name */
 		if (!strcmp((*ops_it)->name, name))