Skip to content

Commit 2796b43

Browse files
TinyWindzzgregkh
TinyWindzz
authored and
gregkh
committed
misc: remove GENWQE_DEBUGFS_RO()
We already have the DEFINE_SHOW_ATTRIBUTE.There is no need to define such a macro,so remove GENWQE_DEBUGFS_RO.Also use DEFINE_SHOW_ATTRIBUTE to simplify some code. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ddfa728 commit 2796b43

File tree

8 files changed

+73
-268
lines changed

8 files changed

+73
-268
lines changed

‎drivers/misc/genwqe/card_debugfs.c

Lines changed: 36 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@
3333
#include "card_base.h"
3434
#include "card_ddcb.h"
3535

36-
#define GENWQE_DEBUGFS_RO(_name, _showfn) \
37-
static int genwqe_debugfs_##_name##_open(struct inode *inode, \
38-
struct file *file) \
39-
{ \
40-
return single_open(file, _showfn, inode->i_private); \
41-
} \
42-
static const struct file_operations genwqe_##_name##_fops = { \
43-
.open = genwqe_debugfs_##_name##_open, \
44-
.read = seq_read, \
45-
.llseek = seq_lseek, \
46-
.release = single_release, \
47-
}
48-
4936
static void dbg_uidn_show(struct seq_file *s, struct genwqe_reg *regs,
5037
int entries)
5138
{
@@ -87,26 +74,26 @@ static int curr_dbg_uidn_show(struct seq_file *s, void *unused, int uid)
8774
return 0;
8875
}
8976

90-
static int genwqe_curr_dbg_uid0_show(struct seq_file *s, void *unused)
77+
static int curr_dbg_uid0_show(struct seq_file *s, void *unused)
9178
{
9279
return curr_dbg_uidn_show(s, unused, 0);
9380
}
9481

95-
GENWQE_DEBUGFS_RO(curr_dbg_uid0, genwqe_curr_dbg_uid0_show);
82+
DEFINE_SHOW_ATTRIBUTE(curr_dbg_uid0);
9683

97-
static int genwqe_curr_dbg_uid1_show(struct seq_file *s, void *unused)
84+
static int curr_dbg_uid1_show(struct seq_file *s, void *unused)
9885
{
9986
return curr_dbg_uidn_show(s, unused, 1);
10087
}
10188

102-
GENWQE_DEBUGFS_RO(curr_dbg_uid1, genwqe_curr_dbg_uid1_show);
89+
DEFINE_SHOW_ATTRIBUTE(curr_dbg_uid1);
10390

104-
static int genwqe_curr_dbg_uid2_show(struct seq_file *s, void *unused)
91+
static int curr_dbg_uid2_show(struct seq_file *s, void *unused)
10592
{
10693
return curr_dbg_uidn_show(s, unused, 2);
10794
}
10895

109-
GENWQE_DEBUGFS_RO(curr_dbg_uid2, genwqe_curr_dbg_uid2_show);
96+
DEFINE_SHOW_ATTRIBUTE(curr_dbg_uid2);
11097

11198
static int prev_dbg_uidn_show(struct seq_file *s, void *unused, int uid)
11299
{
@@ -116,28 +103,28 @@ static int prev_dbg_uidn_show(struct seq_file *s, void *unused, int uid)
116103
return 0;
117104
}
118105

119-
static int genwqe_prev_dbg_uid0_show(struct seq_file *s, void *unused)
106+
static int prev_dbg_uid0_show(struct seq_file *s, void *unused)
120107
{
121108
return prev_dbg_uidn_show(s, unused, 0);
122109
}
123110

124-
GENWQE_DEBUGFS_RO(prev_dbg_uid0, genwqe_prev_dbg_uid0_show);
111+
DEFINE_SHOW_ATTRIBUTE(prev_dbg_uid0);
125112

126-
static int genwqe_prev_dbg_uid1_show(struct seq_file *s, void *unused)
113+
static int prev_dbg_uid1_show(struct seq_file *s, void *unused)
127114
{
128115
return prev_dbg_uidn_show(s, unused, 1);
129116
}
130117

131-
GENWQE_DEBUGFS_RO(prev_dbg_uid1, genwqe_prev_dbg_uid1_show);
118+
DEFINE_SHOW_ATTRIBUTE(prev_dbg_uid1);
132119

133-
static int genwqe_prev_dbg_uid2_show(struct seq_file *s, void *unused)
120+
static int prev_dbg_uid2_show(struct seq_file *s, void *unused)
134121
{
135122
return prev_dbg_uidn_show(s, unused, 2);
136123
}
137124

138-
GENWQE_DEBUGFS_RO(prev_dbg_uid2, genwqe_prev_dbg_uid2_show);
125+
DEFINE_SHOW_ATTRIBUTE(prev_dbg_uid2);
139126

140-
static int genwqe_curr_regs_show(struct seq_file *s, void *unused)
127+
static int curr_regs_show(struct seq_file *s, void *unused)
141128
{
142129
struct genwqe_dev *cd = s->private;
143130
unsigned int i;
@@ -164,9 +151,9 @@ static int genwqe_curr_regs_show(struct seq_file *s, void *unused)
164151
return 0;
165152
}
166153

167-
GENWQE_DEBUGFS_RO(curr_regs, genwqe_curr_regs_show);
154+
DEFINE_SHOW_ATTRIBUTE(curr_regs);
168155

169-
static int genwqe_prev_regs_show(struct seq_file *s, void *unused)
156+
static int prev_regs_show(struct seq_file *s, void *unused)
170157
{
171158
struct genwqe_dev *cd = s->private;
172159
unsigned int i;
@@ -188,9 +175,9 @@ static int genwqe_prev_regs_show(struct seq_file *s, void *unused)
188175
return 0;
189176
}
190177

191-
GENWQE_DEBUGFS_RO(prev_regs, genwqe_prev_regs_show);
178+
DEFINE_SHOW_ATTRIBUTE(prev_regs);
192179

193-
static int genwqe_jtimer_show(struct seq_file *s, void *unused)
180+
static int jtimer_show(struct seq_file *s, void *unused)
194181
{
195182
struct genwqe_dev *cd = s->private;
196183
unsigned int vf_num;
@@ -209,9 +196,9 @@ static int genwqe_jtimer_show(struct seq_file *s, void *unused)
209196
return 0;
210197
}
211198

212-
GENWQE_DEBUGFS_RO(jtimer, genwqe_jtimer_show);
199+
DEFINE_SHOW_ATTRIBUTE(jtimer);
213200

214-
static int genwqe_queue_working_time_show(struct seq_file *s, void *unused)
201+
static int queue_working_time_show(struct seq_file *s, void *unused)
215202
{
216203
struct genwqe_dev *cd = s->private;
217204
unsigned int vf_num;
@@ -227,9 +214,9 @@ static int genwqe_queue_working_time_show(struct seq_file *s, void *unused)
227214
return 0;
228215
}
229216

230-
GENWQE_DEBUGFS_RO(queue_working_time, genwqe_queue_working_time_show);
217+
DEFINE_SHOW_ATTRIBUTE(queue_working_time);
231218

232-
static int genwqe_ddcb_info_show(struct seq_file *s, void *unused)
219+
static int ddcb_info_show(struct seq_file *s, void *unused)
233220
{
234221
struct genwqe_dev *cd = s->private;
235222
unsigned int i;
@@ -300,9 +287,9 @@ static int genwqe_ddcb_info_show(struct seq_file *s, void *unused)
300287
return 0;
301288
}
302289

303-
GENWQE_DEBUGFS_RO(ddcb_info, genwqe_ddcb_info_show);
290+
DEFINE_SHOW_ATTRIBUTE(ddcb_info);
304291

305-
static int genwqe_info_show(struct seq_file *s, void *unused)
292+
static int info_show(struct seq_file *s, void *unused)
306293
{
307294
struct genwqe_dev *cd = s->private;
308295
u64 app_id, slu_id, bitstream = -1;
@@ -335,7 +322,7 @@ static int genwqe_info_show(struct seq_file *s, void *unused)
335322
return 0;
336323
}
337324

338-
GENWQE_DEBUGFS_RO(info, genwqe_info_show);
325+
DEFINE_SHOW_ATTRIBUTE(info);
339326

340327
int genwqe_init_debugfs(struct genwqe_dev *cd)
341328
{
@@ -356,14 +343,14 @@ int genwqe_init_debugfs(struct genwqe_dev *cd)
356343

357344
/* non privileged interfaces are done here */
358345
file = debugfs_create_file("ddcb_info", S_IRUGO, root, cd,
359-
&genwqe_ddcb_info_fops);
346+
&ddcb_info_fops);
360347
if (!file) {
361348
ret = -ENOMEM;
362349
goto err1;
363350
}
364351

365352
file = debugfs_create_file("info", S_IRUGO, root, cd,
366-
&genwqe_info_fops);
353+
&info_fops);
367354
if (!file) {
368355
ret = -ENOMEM;
369356
goto err1;
@@ -396,56 +383,56 @@ int genwqe_init_debugfs(struct genwqe_dev *cd)
396383
}
397384

398385
file = debugfs_create_file("curr_regs", S_IRUGO, root, cd,
399-
&genwqe_curr_regs_fops);
386+
&curr_regs_fops);
400387
if (!file) {
401388
ret = -ENOMEM;
402389
goto err1;
403390
}
404391

405392
file = debugfs_create_file("curr_dbg_uid0", S_IRUGO, root, cd,
406-
&genwqe_curr_dbg_uid0_fops);
393+
&curr_dbg_uid0_fops);
407394
if (!file) {
408395
ret = -ENOMEM;
409396
goto err1;
410397
}
411398

412399
file = debugfs_create_file("curr_dbg_uid1", S_IRUGO, root, cd,
413-
&genwqe_curr_dbg_uid1_fops);
400+
&curr_dbg_uid1_fops);
414401
if (!file) {
415402
ret = -ENOMEM;
416403
goto err1;
417404
}
418405

419406
file = debugfs_create_file("curr_dbg_uid2", S_IRUGO, root, cd,
420-
&genwqe_curr_dbg_uid2_fops);
407+
&curr_dbg_uid2_fops);
421408
if (!file) {
422409
ret = -ENOMEM;
423410
goto err1;
424411
}
425412

426413
file = debugfs_create_file("prev_regs", S_IRUGO, root, cd,
427-
&genwqe_prev_regs_fops);
414+
&prev_regs_fops);
428415
if (!file) {
429416
ret = -ENOMEM;
430417
goto err1;
431418
}
432419

433420
file = debugfs_create_file("prev_dbg_uid0", S_IRUGO, root, cd,
434-
&genwqe_prev_dbg_uid0_fops);
421+
&prev_dbg_uid0_fops);
435422
if (!file) {
436423
ret = -ENOMEM;
437424
goto err1;
438425
}
439426

440427
file = debugfs_create_file("prev_dbg_uid1", S_IRUGO, root, cd,
441-
&genwqe_prev_dbg_uid1_fops);
428+
&prev_dbg_uid1_fops);
442429
if (!file) {
443430
ret = -ENOMEM;
444431
goto err1;
445432
}
446433

447434
file = debugfs_create_file("prev_dbg_uid2", S_IRUGO, root, cd,
448-
&genwqe_prev_dbg_uid2_fops);
435+
&prev_dbg_uid2_fops);
449436
if (!file) {
450437
ret = -ENOMEM;
451438
goto err1;
@@ -463,14 +450,14 @@ int genwqe_init_debugfs(struct genwqe_dev *cd)
463450
}
464451

465452
file = debugfs_create_file("jobtimer", S_IRUGO, root, cd,
466-
&genwqe_jtimer_fops);
453+
&jtimer_fops);
467454
if (!file) {
468455
ret = -ENOMEM;
469456
goto err1;
470457
}
471458

472459
file = debugfs_create_file("queue_working_time", S_IRUGO, root, cd,
473-
&genwqe_queue_working_time_fops);
460+
&queue_working_time_fops);
474461
if (!file) {
475462
ret = -ENOMEM;
476463
goto err1;

‎drivers/misc/mic/card/mic_debugfs.c

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
static struct dentry *mic_dbg;
3838

3939
/**
40-
* mic_intr_test - Send interrupts to host.
40+
* mic_intr_show - Send interrupts to host.
4141
*/
42-
static int mic_intr_test(struct seq_file *s, void *unused)
42+
static int mic_intr_show(struct seq_file *s, void *unused)
4343
{
4444
struct mic_driver *mdrv = s->private;
4545
struct mic_device *mdev = &mdrv->mdev;
@@ -56,23 +56,7 @@ static int mic_intr_test(struct seq_file *s, void *unused)
5656
return 0;
5757
}
5858

59-
static int mic_intr_test_open(struct inode *inode, struct file *file)
60-
{
61-
return single_open(file, mic_intr_test, inode->i_private);
62-
}
63-
64-
static int mic_intr_test_release(struct inode *inode, struct file *file)
65-
{
66-
return single_release(inode, file);
67-
}
68-
69-
static const struct file_operations intr_test_ops = {
70-
.owner = THIS_MODULE,
71-
.open = mic_intr_test_open,
72-
.read = seq_read,
73-
.llseek = seq_lseek,
74-
.release = mic_intr_test_release
75-
};
59+
DEFINE_SHOW_ATTRIBUTE(mic_intr);
7660

7761
/**
7862
* mic_create_card_debug_dir - Initialize MIC debugfs entries.
@@ -91,7 +75,7 @@ void __init mic_create_card_debug_dir(struct mic_driver *mdrv)
9175
}
9276

9377
d = debugfs_create_file("intr_test", 0444, mdrv->dbg_dir,
94-
mdrv, &intr_test_ops);
78+
mdrv, &mic_intr_fops);
9579

9680
if (!d) {
9781
dev_err(mdrv->dev,

‎drivers/misc/mic/cosm/cosm_debugfs.c

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
static struct dentry *cosm_dbg;
2929

3030
/**
31-
* cosm_log_buf_show - Display MIC kernel log buffer
31+
* log_buf_show - Display MIC kernel log buffer
3232
*
3333
* log_buf addr/len is read from System.map by user space
3434
* and populated in sysfs entries.
3535
*/
36-
static int cosm_log_buf_show(struct seq_file *s, void *unused)
36+
static int log_buf_show(struct seq_file *s, void *unused)
3737
{
3838
void __iomem *log_buf_va;
3939
int __iomem *log_buf_len_va;
@@ -78,45 +78,23 @@ static int cosm_log_buf_show(struct seq_file *s, void *unused)
7878
return 0;
7979
}
8080

81-
static int cosm_log_buf_open(struct inode *inode, struct file *file)
82-
{
83-
return single_open(file, cosm_log_buf_show, inode->i_private);
84-
}
85-
86-
static const struct file_operations log_buf_ops = {
87-
.owner = THIS_MODULE,
88-
.open = cosm_log_buf_open,
89-
.read = seq_read,
90-
.llseek = seq_lseek,
91-
.release = single_release
92-
};
81+
DEFINE_SHOW_ATTRIBUTE(log_buf);
9382

9483
/**
95-
* cosm_force_reset_show - Force MIC reset
84+
* force_reset_show - Force MIC reset
9685
*
9786
* Invokes the force_reset COSM bus op instead of the standard reset
9887
* op in case a force reset of the MIC device is required
9988
*/
100-
static int cosm_force_reset_show(struct seq_file *s, void *pos)
89+
static int force_reset_show(struct seq_file *s, void *pos)
10190
{
10291
struct cosm_device *cdev = s->private;
10392

10493
cosm_stop(cdev, true);
10594
return 0;
10695
}
10796

108-
static int cosm_force_reset_debug_open(struct inode *inode, struct file *file)
109-
{
110-
return single_open(file, cosm_force_reset_show, inode->i_private);
111-
}
112-
113-
static const struct file_operations force_reset_ops = {
114-
.owner = THIS_MODULE,
115-
.open = cosm_force_reset_debug_open,
116-
.read = seq_read,
117-
.llseek = seq_lseek,
118-
.release = single_release
119-
};
97+
DEFINE_SHOW_ATTRIBUTE(force_reset);
12098

12199
void cosm_create_debug_dir(struct cosm_device *cdev)
122100
{
@@ -130,9 +108,10 @@ void cosm_create_debug_dir(struct cosm_device *cdev)
130108
if (!cdev->dbg_dir)
131109
return;
132110

133-
debugfs_create_file("log_buf", 0444, cdev->dbg_dir, cdev, &log_buf_ops);
111+
debugfs_create_file("log_buf", 0444, cdev->dbg_dir, cdev,
112+
&log_buf_fops);
134113
debugfs_create_file("force_reset", 0444, cdev->dbg_dir, cdev,
135-
&force_reset_ops);
114+
&force_reset_fops);
136115
}
137116

138117
void cosm_delete_debug_dir(struct cosm_device *cdev)

0 commit comments

Comments
 (0)