Skip to content

Commit d32dcc6

Browse files
TinyWindzzrafaeljw
TinyWindzz
authored and
rafaeljw
committed
PM / Domains: remove define_genpd_open_function() and define_genpd_debugfs_fops()
We already have the DEFINE_SHOW_ATTRIBUTE, There is no need to define such a macro, so remove define_genpd_open_function and define_genpd_debugfs_fops. Convert them to DEFINE_SHOW_ATTRIBUTE. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 7566ec3 commit d32dcc6

File tree

1 file changed

+24
-47
lines changed

1 file changed

+24
-47
lines changed

‎drivers/base/power/domain.c

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2671,7 +2671,7 @@ static int genpd_summary_one(struct seq_file *s,
26712671
return 0;
26722672
}
26732673

2674-
static int genpd_summary_show(struct seq_file *s, void *data)
2674+
static int summary_show(struct seq_file *s, void *data)
26752675
{
26762676
struct generic_pm_domain *genpd;
26772677
int ret = 0;
@@ -2694,7 +2694,7 @@ static int genpd_summary_show(struct seq_file *s, void *data)
26942694
return ret;
26952695
}
26962696

2697-
static int genpd_status_show(struct seq_file *s, void *data)
2697+
static int status_show(struct seq_file *s, void *data)
26982698
{
26992699
static const char * const status_lookup[] = {
27002700
[GPD_STATE_ACTIVE] = "on",
@@ -2721,7 +2721,7 @@ static int genpd_status_show(struct seq_file *s, void *data)
27212721
return ret;
27222722
}
27232723

2724-
static int genpd_sub_domains_show(struct seq_file *s, void *data)
2724+
static int sub_domains_show(struct seq_file *s, void *data)
27252725
{
27262726
struct generic_pm_domain *genpd = s->private;
27272727
struct gpd_link *link;
@@ -2738,7 +2738,7 @@ static int genpd_sub_domains_show(struct seq_file *s, void *data)
27382738
return ret;
27392739
}
27402740

2741-
static int genpd_idle_states_show(struct seq_file *s, void *data)
2741+
static int idle_states_show(struct seq_file *s, void *data)
27422742
{
27432743
struct generic_pm_domain *genpd = s->private;
27442744
unsigned int i;
@@ -2767,7 +2767,7 @@ static int genpd_idle_states_show(struct seq_file *s, void *data)
27672767
return ret;
27682768
}
27692769

2770-
static int genpd_active_time_show(struct seq_file *s, void *data)
2770+
static int active_time_show(struct seq_file *s, void *data)
27712771
{
27722772
struct generic_pm_domain *genpd = s->private;
27732773
ktime_t delta = 0;
@@ -2787,7 +2787,7 @@ static int genpd_active_time_show(struct seq_file *s, void *data)
27872787
return ret;
27882788
}
27892789

2790-
static int genpd_total_idle_time_show(struct seq_file *s, void *data)
2790+
static int total_idle_time_show(struct seq_file *s, void *data)
27912791
{
27922792
struct generic_pm_domain *genpd = s->private;
27932793
ktime_t delta = 0, total = 0;
@@ -2815,7 +2815,7 @@ static int genpd_total_idle_time_show(struct seq_file *s, void *data)
28152815
}
28162816

28172817

2818-
static int genpd_devices_show(struct seq_file *s, void *data)
2818+
static int devices_show(struct seq_file *s, void *data)
28192819
{
28202820
struct generic_pm_domain *genpd = s->private;
28212821
struct pm_domain_data *pm_data;
@@ -2841,7 +2841,7 @@ static int genpd_devices_show(struct seq_file *s, void *data)
28412841
return ret;
28422842
}
28432843

2844-
static int genpd_perf_state_show(struct seq_file *s, void *data)
2844+
static int perf_state_show(struct seq_file *s, void *data)
28452845
{
28462846
struct generic_pm_domain *genpd = s->private;
28472847

@@ -2854,37 +2854,14 @@ static int genpd_perf_state_show(struct seq_file *s, void *data)
28542854
return 0;
28552855
}
28562856

2857-
#define define_genpd_open_function(name) \
2858-
static int genpd_##name##_open(struct inode *inode, struct file *file) \
2859-
{ \
2860-
return single_open(file, genpd_##name##_show, inode->i_private); \
2861-
}
2862-
2863-
define_genpd_open_function(summary);
2864-
define_genpd_open_function(status);
2865-
define_genpd_open_function(sub_domains);
2866-
define_genpd_open_function(idle_states);
2867-
define_genpd_open_function(active_time);
2868-
define_genpd_open_function(total_idle_time);
2869-
define_genpd_open_function(devices);
2870-
define_genpd_open_function(perf_state);
2871-
2872-
#define define_genpd_debugfs_fops(name) \
2873-
static const struct file_operations genpd_##name##_fops = { \
2874-
.open = genpd_##name##_open, \
2875-
.read = seq_read, \
2876-
.llseek = seq_lseek, \
2877-
.release = single_release, \
2878-
}
2879-
2880-
define_genpd_debugfs_fops(summary);
2881-
define_genpd_debugfs_fops(status);
2882-
define_genpd_debugfs_fops(sub_domains);
2883-
define_genpd_debugfs_fops(idle_states);
2884-
define_genpd_debugfs_fops(active_time);
2885-
define_genpd_debugfs_fops(total_idle_time);
2886-
define_genpd_debugfs_fops(devices);
2887-
define_genpd_debugfs_fops(perf_state);
2857+
DEFINE_SHOW_ATTRIBUTE(summary);
2858+
DEFINE_SHOW_ATTRIBUTE(status);
2859+
DEFINE_SHOW_ATTRIBUTE(sub_domains);
2860+
DEFINE_SHOW_ATTRIBUTE(idle_states);
2861+
DEFINE_SHOW_ATTRIBUTE(active_time);
2862+
DEFINE_SHOW_ATTRIBUTE(total_idle_time);
2863+
DEFINE_SHOW_ATTRIBUTE(devices);
2864+
DEFINE_SHOW_ATTRIBUTE(perf_state);
28882865

28892866
static int __init genpd_debug_init(void)
28902867
{
@@ -2897,7 +2874,7 @@ static int __init genpd_debug_init(void)
28972874
return -ENOMEM;
28982875

28992876
d = debugfs_create_file("pm_genpd_summary", S_IRUGO,
2900-
genpd_debugfs_dir, NULL, &genpd_summary_fops);
2877+
genpd_debugfs_dir, NULL, &summary_fops);
29012878
if (!d)
29022879
return -ENOMEM;
29032880

@@ -2907,20 +2884,20 @@ static int __init genpd_debug_init(void)
29072884
return -ENOMEM;
29082885

29092886
debugfs_create_file("current_state", 0444,
2910-
d, genpd, &genpd_status_fops);
2887+
d, genpd, &status_fops);
29112888
debugfs_create_file("sub_domains", 0444,
2912-
d, genpd, &genpd_sub_domains_fops);
2889+
d, genpd, &sub_domains_fops);
29132890
debugfs_create_file("idle_states", 0444,
2914-
d, genpd, &genpd_idle_states_fops);
2891+
d, genpd, &idle_states_fops);
29152892
debugfs_create_file("active_time", 0444,
2916-
d, genpd, &genpd_active_time_fops);
2893+
d, genpd, &active_time_fops);
29172894
debugfs_create_file("total_idle_time", 0444,
2918-
d, genpd, &genpd_total_idle_time_fops);
2895+
d, genpd, &total_idle_time_fops);
29192896
debugfs_create_file("devices", 0444,
2920-
d, genpd, &genpd_devices_fops);
2897+
d, genpd, &devices_fops);
29212898
if (genpd->set_performance_state)
29222899
debugfs_create_file("perf_state", 0444,
2923-
d, genpd, &genpd_perf_state_fops);
2900+
d, genpd, &perf_state_fops);
29242901
}
29252902

29262903
return 0;

0 commit comments

Comments
 (0)