Skip to content

Commit a2dea4c

Browse files
gregkhvireshk
gregkh
authored and
vireshk
committed
opp: no need to check return value of debugfs_create functions
When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this. Cc: Viresh Kumar <vireshk@kernel.org> Cc: Nishanth Menon <nm@ti.com> Cc: Stephen Boyd <sboyd@kernel.org> Cc: linux-pm@vger.kernel.org Reviewed-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent 1058d1e commit a2dea4c

File tree

3 files changed

+38
-98
lines changed

3 files changed

+38
-98
lines changed

‎drivers/opp/core.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,6 @@ static struct opp_device *_add_opp_dev_unlocked(const struct device *dev,
792792
struct opp_table *opp_table)
793793
{
794794
struct opp_device *opp_dev;
795-
int ret;
796795

797796
opp_dev = kzalloc(sizeof(*opp_dev), GFP_KERNEL);
798797
if (!opp_dev)
@@ -804,10 +803,7 @@ static struct opp_device *_add_opp_dev_unlocked(const struct device *dev,
804803
list_add(&opp_dev->node, &opp_table->dev_list);
805804

806805
/* Create debugfs entries for the opp_table */
807-
ret = opp_debug_register(opp_dev, opp_table);
808-
if (ret)
809-
dev_err(dev, "%s: Failed to register opp debugfs (%d)\n",
810-
__func__, ret);
806+
opp_debug_register(opp_dev, opp_table);
811807

812808
return opp_dev;
813809
}
@@ -1175,10 +1171,7 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
11751171
new_opp->opp_table = opp_table;
11761172
kref_init(&new_opp->kref);
11771173

1178-
ret = opp_debug_create_one(new_opp, opp_table);
1179-
if (ret)
1180-
dev_err(dev, "%s: Failed to register opp to debugfs (%d)\n",
1181-
__func__, ret);
1174+
opp_debug_create_one(new_opp, opp_table);
11821175

11831176
if (!_opp_supported_by_regulators(new_opp, opp_table)) {
11841177
new_opp->available = false;

‎drivers/opp/debugfs.c

Lines changed: 29 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void opp_debug_remove_one(struct dev_pm_opp *opp)
3535
debugfs_remove_recursive(opp->dentry);
3636
}
3737

38-
static bool opp_debug_create_supplies(struct dev_pm_opp *opp,
38+
static void opp_debug_create_supplies(struct dev_pm_opp *opp,
3939
struct opp_table *opp_table,
4040
struct dentry *pdentry)
4141
{
@@ -50,30 +50,21 @@ static bool opp_debug_create_supplies(struct dev_pm_opp *opp,
5050
/* Create per-opp directory */
5151
d = debugfs_create_dir(name, pdentry);
5252

53-
if (!d)
54-
return false;
53+
debugfs_create_ulong("u_volt_target", S_IRUGO, d,
54+
&opp->supplies[i].u_volt);
5555

56-
if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d,
57-
&opp->supplies[i].u_volt))
58-
return false;
56+
debugfs_create_ulong("u_volt_min", S_IRUGO, d,
57+
&opp->supplies[i].u_volt_min);
5958

60-
if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d,
61-
&opp->supplies[i].u_volt_min))
62-
return false;
59+
debugfs_create_ulong("u_volt_max", S_IRUGO, d,
60+
&opp->supplies[i].u_volt_max);
6361

64-
if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d,
65-
&opp->supplies[i].u_volt_max))
66-
return false;
67-
68-
if (!debugfs_create_ulong("u_amp", S_IRUGO, d,
69-
&opp->supplies[i].u_amp))
70-
return false;
62+
debugfs_create_ulong("u_amp", S_IRUGO, d,
63+
&opp->supplies[i].u_amp);
7164
}
72-
73-
return true;
7465
}
7566

76-
int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
67+
void opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
7768
{
7869
struct dentry *pdentry = opp_table->dentry;
7970
struct dentry *d;
@@ -95,40 +86,23 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
9586

9687
/* Create per-opp directory */
9788
d = debugfs_create_dir(name, pdentry);
98-
if (!d)
99-
return -ENOMEM;
100-
101-
if (!debugfs_create_bool("available", S_IRUGO, d, &opp->available))
102-
return -ENOMEM;
103-
104-
if (!debugfs_create_bool("dynamic", S_IRUGO, d, &opp->dynamic))
105-
return -ENOMEM;
106-
107-
if (!debugfs_create_bool("turbo", S_IRUGO, d, &opp->turbo))
108-
return -ENOMEM;
109-
110-
if (!debugfs_create_bool("suspend", S_IRUGO, d, &opp->suspend))
111-
return -ENOMEM;
112-
113-
if (!debugfs_create_u32("performance_state", S_IRUGO, d, &opp->pstate))
114-
return -ENOMEM;
11589

116-
if (!debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate))
117-
return -ENOMEM;
90+
debugfs_create_bool("available", S_IRUGO, d, &opp->available);
91+
debugfs_create_bool("dynamic", S_IRUGO, d, &opp->dynamic);
92+
debugfs_create_bool("turbo", S_IRUGO, d, &opp->turbo);
93+
debugfs_create_bool("suspend", S_IRUGO, d, &opp->suspend);
94+
debugfs_create_u32("performance_state", S_IRUGO, d, &opp->pstate);
95+
debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate);
96+
debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
97+
&opp->clock_latency_ns);
11898

119-
if (!opp_debug_create_supplies(opp, opp_table, d))
120-
return -ENOMEM;
121-
122-
if (!debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
123-
&opp->clock_latency_ns))
124-
return -ENOMEM;
99+
opp_debug_create_supplies(opp, opp_table, d);
125100

126101
opp->dentry = d;
127-
return 0;
128102
}
129103

130-
static int opp_list_debug_create_dir(struct opp_device *opp_dev,
131-
struct opp_table *opp_table)
104+
static void opp_list_debug_create_dir(struct opp_device *opp_dev,
105+
struct opp_table *opp_table)
132106
{
133107
const struct device *dev = opp_dev->dev;
134108
struct dentry *d;
@@ -137,36 +111,21 @@ static int opp_list_debug_create_dir(struct opp_device *opp_dev,
137111

138112
/* Create device specific directory */
139113
d = debugfs_create_dir(opp_table->dentry_name, rootdir);
140-
if (!d) {
141-
dev_err(dev, "%s: Failed to create debugfs dir\n", __func__);
142-
return -ENOMEM;
143-
}
144114

145115
opp_dev->dentry = d;
146116
opp_table->dentry = d;
147-
148-
return 0;
149117
}
150118

151-
static int opp_list_debug_create_link(struct opp_device *opp_dev,
152-
struct opp_table *opp_table)
119+
static void opp_list_debug_create_link(struct opp_device *opp_dev,
120+
struct opp_table *opp_table)
153121
{
154-
const struct device *dev = opp_dev->dev;
155122
char name[NAME_MAX];
156-
struct dentry *d;
157123

158124
opp_set_dev_name(opp_dev->dev, name);
159125

160126
/* Create device specific directory link */
161-
d = debugfs_create_symlink(name, rootdir, opp_table->dentry_name);
162-
if (!d) {
163-
dev_err(dev, "%s: Failed to create link\n", __func__);
164-
return -ENOMEM;
165-
}
166-
167-
opp_dev->dentry = d;
168-
169-
return 0;
127+
opp_dev->dentry = debugfs_create_symlink(name, rootdir,
128+
opp_table->dentry_name);
170129
}
171130

172131
/**
@@ -177,20 +136,13 @@ static int opp_list_debug_create_link(struct opp_device *opp_dev,
177136
* Dynamically adds device specific directory in debugfs 'opp' directory. If the
178137
* device-opp is shared with other devices, then links will be created for all
179138
* devices except the first.
180-
*
181-
* Return: 0 on success, otherwise negative error.
182139
*/
183-
int opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table)
140+
void opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table)
184141
{
185-
if (!rootdir) {
186-
pr_debug("%s: Uninitialized rootdir\n", __func__);
187-
return -EINVAL;
188-
}
189-
190142
if (opp_table->dentry)
191-
return opp_list_debug_create_link(opp_dev, opp_table);
192-
193-
return opp_list_debug_create_dir(opp_dev, opp_table);
143+
opp_list_debug_create_link(opp_dev, opp_table);
144+
else
145+
opp_list_debug_create_dir(opp_dev, opp_table);
194146
}
195147

196148
static void opp_migrate_dentry(struct opp_device *opp_dev,
@@ -252,10 +204,6 @@ static int __init opp_debug_init(void)
252204
{
253205
/* Create /sys/kernel/debug/opp directory */
254206
rootdir = debugfs_create_dir("opp", NULL);
255-
if (!rootdir) {
256-
pr_err("%s: Failed to create root directory\n", __func__);
257-
return -ENOMEM;
258-
}
259207

260208
return 0;
261209
}

‎drivers/opp/opp.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,18 +236,17 @@ static inline void _of_opp_free_required_opps(struct opp_table *opp_table,
236236

237237
#ifdef CONFIG_DEBUG_FS
238238
void opp_debug_remove_one(struct dev_pm_opp *opp);
239-
int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table);
240-
int opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table);
239+
void opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table);
240+
void opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table);
241241
void opp_debug_unregister(struct opp_device *opp_dev, struct opp_table *opp_table);
242242
#else
243243
static inline void opp_debug_remove_one(struct dev_pm_opp *opp) {}
244244

245-
static inline int opp_debug_create_one(struct dev_pm_opp *opp,
246-
struct opp_table *opp_table)
247-
{ return 0; }
248-
static inline int opp_debug_register(struct opp_device *opp_dev,
249-
struct opp_table *opp_table)
250-
{ return 0; }
245+
static inline void opp_debug_create_one(struct dev_pm_opp *opp,
246+
struct opp_table *opp_table) { }
247+
248+
static inline void opp_debug_register(struct opp_device *opp_dev,
249+
struct opp_table *opp_table) { }
251250

252251
static inline void opp_debug_unregister(struct opp_device *opp_dev,
253252
struct opp_table *opp_table)

0 commit comments

Comments
 (0)