Skip to content

Commit c63254a

Browse files
Al Virogregkh
authored andcommitted
mtu3: don't mess wiht ->d_iname
use debugfs_{create_file,get}_aux() instead. Signed-off-by: Al Viro <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c05fc27 commit c63254a

File tree

1 file changed

+7
-33
lines changed

1 file changed

+7
-33
lines changed

drivers/usb/mtu3/mtu3_debugfs.c

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,7 @@ static const struct mtu3_file_map mtu3_ep_files[] = {
256256

257257
static int mtu3_ep_open(struct inode *inode, struct file *file)
258258
{
259-
const char *file_name = file_dentry(file)->d_iname;
260-
const struct mtu3_file_map *f_map;
261-
int i;
262-
263-
for (i = 0; i < ARRAY_SIZE(mtu3_ep_files); i++) {
264-
f_map = &mtu3_ep_files[i];
265-
266-
if (strcmp(f_map->name, file_name) == 0)
267-
break;
268-
}
259+
const struct mtu3_file_map *f_map = debugfs_get_aux(file);
269260

270261
return single_open(file, f_map->show, inode->i_private);
271262
}
@@ -288,17 +279,8 @@ static const struct debugfs_reg32 mtu3_prb_regs[] = {
288279

289280
static int mtu3_probe_show(struct seq_file *sf, void *unused)
290281
{
291-
const char *file_name = file_dentry(sf->file)->d_iname;
292282
struct mtu3 *mtu = sf->private;
293-
const struct debugfs_reg32 *regs;
294-
int i;
295-
296-
for (i = 0; i < ARRAY_SIZE(mtu3_prb_regs); i++) {
297-
regs = &mtu3_prb_regs[i];
298-
299-
if (strcmp(regs->name, file_name) == 0)
300-
break;
301-
}
283+
const struct debugfs_reg32 *regs = debugfs_get_aux(sf->file);
302284

303285
seq_printf(sf, "0x%04x - 0x%08x\n", (u32)regs->offset,
304286
mtu3_readl(mtu->ippc_base, (u32)regs->offset));
@@ -314,26 +296,18 @@ static int mtu3_probe_open(struct inode *inode, struct file *file)
314296
static ssize_t mtu3_probe_write(struct file *file, const char __user *ubuf,
315297
size_t count, loff_t *ppos)
316298
{
317-
const char *file_name = file_dentry(file)->d_iname;
318299
struct seq_file *sf = file->private_data;
319300
struct mtu3 *mtu = sf->private;
320-
const struct debugfs_reg32 *regs;
301+
const struct debugfs_reg32 *regs = debugfs_get_aux(file);
321302
char buf[32];
322303
u32 val;
323-
int i;
324304

325305
if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
326306
return -EFAULT;
327307

328308
if (kstrtou32(buf, 0, &val))
329309
return -EINVAL;
330310

331-
for (i = 0; i < ARRAY_SIZE(mtu3_prb_regs); i++) {
332-
regs = &mtu3_prb_regs[i];
333-
334-
if (strcmp(regs->name, file_name) == 0)
335-
break;
336-
}
337311
mtu3_writel(mtu->ippc_base, (u32)regs->offset, val);
338312

339313
return count;
@@ -358,8 +332,8 @@ static void mtu3_debugfs_create_prb_files(struct mtu3 *mtu)
358332

359333
for (i = 0; i < ARRAY_SIZE(mtu3_prb_regs); i++) {
360334
regs = &mtu3_prb_regs[i];
361-
debugfs_create_file(regs->name, 0644, dir_prb,
362-
mtu, &mtu3_probe_fops);
335+
debugfs_create_file_aux(regs->name, 0644, dir_prb,
336+
mtu, regs, &mtu3_probe_fops);
363337
}
364338

365339
mtu3_debugfs_regset(mtu, mtu->ippc_base, mtu3_prb_regs,
@@ -379,8 +353,8 @@ static void mtu3_debugfs_create_ep_dir(struct mtu3_ep *mep,
379353
for (i = 0; i < ARRAY_SIZE(mtu3_ep_files); i++) {
380354
files = &mtu3_ep_files[i];
381355

382-
debugfs_create_file(files->name, 0444, dir_ep,
383-
mep, &mtu3_ep_fops);
356+
debugfs_create_file_aux(files->name, 0444, dir_ep,
357+
mep, files, &mtu3_ep_fops);
384358
}
385359
}
386360

0 commit comments

Comments
 (0)