Skip to content

Commit 75a9670

Browse files
Al Virogregkh
authored andcommitted
qat: don't mess with ->d_name
use debugfs_{create_file,get}_aux_num() 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 e777ba7 commit 75a9670

File tree

1 file changed

+4
-32
lines changed

1 file changed

+4
-32
lines changed

drivers/crypto/intel/qat/qat_common/adf_tl_debugfs.c

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -473,22 +473,6 @@ static ssize_t tl_control_write(struct file *file, const char __user *userbuf,
473473
}
474474
DEFINE_SHOW_STORE_ATTRIBUTE(tl_control);
475475

476-
static int get_rp_index_from_file(const struct file *f, u8 *rp_id, u8 rp_num)
477-
{
478-
char alpha;
479-
u8 index;
480-
int ret;
481-
482-
ret = sscanf(f->f_path.dentry->d_name.name, ADF_TL_RP_REGS_FNAME, &alpha);
483-
if (ret != 1)
484-
return -EINVAL;
485-
486-
index = ADF_TL_DBG_RP_INDEX_ALPHA(alpha);
487-
*rp_id = index;
488-
489-
return 0;
490-
}
491-
492476
static int adf_tl_dbg_change_rp_index(struct adf_accel_dev *accel_dev,
493477
unsigned int new_rp_num,
494478
unsigned int rp_regs_index)
@@ -611,18 +595,11 @@ static int tl_rp_data_show(struct seq_file *s, void *unused)
611595
{
612596
struct adf_accel_dev *accel_dev = s->private;
613597
u8 rp_regs_index;
614-
u8 max_rp;
615-
int ret;
616598

617599
if (!accel_dev)
618600
return -EINVAL;
619601

620-
max_rp = GET_TL_DATA(accel_dev).max_rp;
621-
ret = get_rp_index_from_file(s->file, &rp_regs_index, max_rp);
622-
if (ret) {
623-
dev_dbg(&GET_DEV(accel_dev), "invalid RP data file name\n");
624-
return ret;
625-
}
602+
rp_regs_index = debugfs_get_aux_num(s->file);
626603

627604
return tl_print_rp_data(accel_dev, s, rp_regs_index);
628605
}
@@ -635,23 +612,17 @@ static ssize_t tl_rp_data_write(struct file *file, const char __user *userbuf,
635612
struct adf_telemetry *telemetry;
636613
unsigned int new_rp_num;
637614
u8 rp_regs_index;
638-
u8 max_rp;
639615
int ret;
640616

641617
accel_dev = seq_f->private;
642618
if (!accel_dev)
643619
return -EINVAL;
644620

645621
telemetry = accel_dev->telemetry;
646-
max_rp = GET_TL_DATA(accel_dev).max_rp;
647622

648623
mutex_lock(&telemetry->wr_lock);
649624

650-
ret = get_rp_index_from_file(file, &rp_regs_index, max_rp);
651-
if (ret) {
652-
dev_dbg(&GET_DEV(accel_dev), "invalid RP data file name\n");
653-
goto unlock_and_exit;
654-
}
625+
rp_regs_index = debugfs_get_aux_num(file);
655626

656627
ret = kstrtou32_from_user(userbuf, count, 10, &new_rp_num);
657628
if (ret)
@@ -689,7 +660,8 @@ void adf_tl_dbgfs_add(struct adf_accel_dev *accel_dev)
689660
for (i = 0; i < max_rp; i++) {
690661
snprintf(name, sizeof(name), ADF_TL_RP_REGS_FNAME,
691662
ADF_TL_DBG_RP_ALPHA_INDEX(i));
692-
debugfs_create_file(name, 0644, dir, accel_dev, &tl_rp_data_fops);
663+
debugfs_create_file_aux_num(name, 0644, dir, accel_dev, i,
664+
&tl_rp_data_fops);
693665
}
694666
}
695667

0 commit comments

Comments
 (0)