Skip to content

Commit f22fa72

Browse files
Al Virogregkh
authored andcommitted
arm_scmi: don't mess with ->d_parent->d_name
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 f9c8dbc commit f22fa72

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/firmware/arm_scmi/raw_mode.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,8 @@ static __poll_t scmi_dbg_raw_mode_message_poll(struct file *filp,
886886

887887
static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp)
888888
{
889-
u8 id;
890889
struct scmi_raw_mode_info *raw;
891890
struct scmi_dbg_raw_data *rd;
892-
const char *id_str = filp->f_path.dentry->d_parent->d_name.name;
893891

894892
if (!inode->i_private)
895893
return -ENODEV;
@@ -915,8 +913,8 @@ static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp)
915913
}
916914

917915
/* Grab channel ID from debugfs entry naming if any */
918-
if (!kstrtou8(id_str, 16, &id))
919-
rd->chan_id = id;
916+
/* not set - reassing 0 we already had after kzalloc() */
917+
rd->chan_id = debugfs_get_aux_num(filp);
920918

921919
rd->raw = raw;
922920
filp->private_data = rd;
@@ -1225,10 +1223,12 @@ void *scmi_raw_mode_init(const struct scmi_handle *handle,
12251223
snprintf(cdir, 8, "0x%02X", channels[i]);
12261224
chd = debugfs_create_dir(cdir, top_chans);
12271225

1228-
debugfs_create_file("message", 0600, chd, raw,
1226+
debugfs_create_file_aux_num("message", 0600, chd,
1227+
raw, channels[i],
12291228
&scmi_dbg_raw_mode_message_fops);
12301229

1231-
debugfs_create_file("message_async", 0600, chd, raw,
1230+
debugfs_create_file_aux_num("message_async", 0600, chd,
1231+
raw, channels[i],
12321232
&scmi_dbg_raw_mode_message_async_fops);
12331233
}
12341234
}

0 commit comments

Comments
 (0)