Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ab3b08 authored by Sriram Raghunathan's avatar Sriram Raghunathan Committed by Rafael J. Wysocki
Browse files

Creating a common structure initialization pattern for struct option 



This patch tries to creates a common structure initialization
within the cpupower tool.

Previously the ``struct option`` was initialized
using `designated initializer` technique which was
not needed. There were conflicting initialization methods seen with

bench/main.c & others.

Signed-off-by: default avatarSriram Raghunathan <sriram@marirs.net.in>
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 19c9fb89

tools/power/cpupower/debug/i386/dump_psb.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void decode_psb(char *p, int numpst) 
}



static struct option info_opts[] = {

	{.name = "numpst",	.has_arg=no_argument,	.flag=NULL, .val='n'},

     {"numpst", no_argument, NULL, 'n'},

};



void print_help(void)

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

+15 −15
Original line number Diff line number Diff line
@@ -536,21 +536,21 @@ static int get_latency(unsigned int cpu, unsigned int human) 
}



static struct option info_opts[] = {

	{ .name = "debug",	.has_arg = no_argument,		.flag = NULL,	.val = 'e'},

	{ .name = "boost",	.has_arg = no_argument,		.flag = NULL,	.val = 'b'},

	{ .name = "freq",	.has_arg = no_argument,		.flag = NULL,	.val = 'f'},

	{ .name = "hwfreq",	.has_arg = no_argument,		.flag = NULL,	.val = 'w'},

	{ .name = "hwlimits",	.has_arg = no_argument,		.flag = NULL,	.val = 'l'},

	{ .name = "driver",	.has_arg = no_argument,		.flag = NULL,	.val = 'd'},

	{ .name = "policy",	.has_arg = no_argument,		.flag = NULL,	.val = 'p'},

	{ .name = "governors",	.has_arg = no_argument,		.flag = NULL,	.val = 'g'},

	{ .name = "related-cpus", .has_arg = no_argument,	.flag = NULL,	.val = 'r'},

	{ .name = "affected-cpus",.has_arg = no_argument,	.flag = NULL,	.val = 'a'},

	{ .name = "stats",	.has_arg = no_argument,		.flag = NULL,	.val = 's'},

	{ .name = "latency",	.has_arg = no_argument,		.flag = NULL,	.val = 'y'},

	{ .name = "proc",	.has_arg = no_argument,		.flag = NULL,	.val = 'o'},

	{ .name = "human",	.has_arg = no_argument,		.flag = NULL,	.val = 'm'},

	{ .name = "no-rounding", .has_arg = no_argument,	.flag = NULL,	.val = 'n'},

	{"debug",	 no_argument,		 NULL,	 'e'},

	{"boost",	 no_argument,		 NULL,	 'b'},

	{"freq",	 no_argument,		 NULL,	 'f'},

	{"hwfreq",	 no_argument,		 NULL,	 'w'},

	{"hwlimits",	 no_argument,		 NULL,	 'l'},

	{"driver",	 no_argument,		 NULL,	 'd'},

	{"policy",	 no_argument,		 NULL,	 'p'},

	{"governors",	 no_argument,		 NULL,	 'g'},

	{"related-cpus",  no_argument,	 NULL,	 'r'},

	{"affected-cpus", no_argument,	 NULL,	 'a'},

	{"stats",	 no_argument,		 NULL,	 's'},

	{"latency",	 no_argument,		 NULL,	 'y'},

	{"proc",	 no_argument,		 NULL,	 'o'},

	{"human",	 no_argument,		 NULL,	 'm'},

	{"no-rounding", no_argument,	 NULL,	 'n'},

	{ },

};

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

+5 −5
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
#define NORM_FREQ_LEN 32



static struct option set_opts[] = {

	{ .name = "min",	.has_arg = required_argument,	.flag = NULL,	.val = 'd'},

	{ .name = "max",	.has_arg = required_argument,	.flag = NULL,	.val = 'u'},

	{ .name = "governor",	.has_arg = required_argument,	.flag = NULL,	.val = 'g'},

	{ .name = "freq",	.has_arg = required_argument,	.flag = NULL,	.val = 'f'},

	{ .name = "related",	.has_arg = no_argument,		.flag = NULL,	.val='r'},

	{"min",		required_argument,	NULL, 'd'},

	{"max",		required_argument,	NULL, 'u'},

	{"governor",	required_argument,	NULL, 'g'},

	{"freq",	required_argument,	NULL, 'f'},

	{"related",	no_argument,		NULL, 'r'},

	{ },

};

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

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) 
}



static struct option info_opts[] = {

	{ .name = "silent",	.has_arg = no_argument,	.flag = NULL,	.val = 's'},

	{ .name = "proc",	.has_arg = no_argument,	.flag = NULL,	.val = 'o'},

	{"silent", no_argument, NULL, 's'},

	{"proc", no_argument, NULL, 'o'},

	{ },

};

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

+5 −9
Original line number Diff line number Diff line
@@ -13,14 +13,10 @@ 
#include "helpers/sysfs.h"



static struct option info_opts[] = {

	{ .name = "disable",

	  .has_arg = required_argument,	.flag = NULL,	.val = 'd'},

	{ .name = "enable",

	  .has_arg = required_argument,	.flag = NULL,	.val = 'e'},

	{ .name = "disable-by-latency",

	  .has_arg = required_argument,	.flag = NULL,	.val = 'D'},

	{ .name = "enable-all",

	  .has_arg = no_argument,	.flag = NULL,	.val = 'E'},

     {"disable",	required_argument,		NULL, 'd'},

     {"enable",		required_argument,		NULL, 'e'},

     {"disable-by-latency", required_argument,		NULL, 'D'},

     {"enable-all",	no_argument,			NULL, 'E'},

     { },

};