Commit a9d56ce0 authored by Xingui Yang's avatar Xingui Yang Committed by Andrew Morton

scsi: qla2xxx: use DEFINE_SHOW_STORE_ATTRIBUTE() helper for debugfs

Use DEFINE_SHOW_STORE_ATTRIBUTE() helper for read-write file to reduce some
duplicated code.

Link: https://lkml.kernel.org/r/20230905024835.43219-4-yangxingui@huawei.comSigned-off-by: default avatarLuo Jiaxing <luojiaxing@huawei.com>
Co-developed-by: default avatarXingui Yang <yangxingui@huawei.com>
Signed-off-by: default avatarXingui Yang <yangxingui@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Animesh Manna <animesh.manna@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Himanshu Madhani <himanshu.madhani@cavium.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Xiang Chen <chenxiang66@hisilicon.com>
Cc: Zeng Tao <prime.zeng@hisilicon.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 00c9d55f
...@@ -528,51 +528,22 @@ qla_dfs_naqp_show(struct seq_file *s, void *unused) ...@@ -528,51 +528,22 @@ qla_dfs_naqp_show(struct seq_file *s, void *unused)
* *
* Example for creating "TEST" sysfs file: * Example for creating "TEST" sysfs file:
* 1. struct qla_hw_data { ... struct dentry *dfs_TEST; } * 1. struct qla_hw_data { ... struct dentry *dfs_TEST; }
* 2. QLA_DFS_SETUP_RD(TEST, scsi_qla_host_t); * 2. QLA_DFS_SETUP_RD(TEST);
* 3. In qla2x00_dfs_setup(): * 3. In qla2x00_dfs_setup():
* QLA_DFS_CREATE_FILE(ha, TEST, 0600, ha->dfs_dir, vha); * QLA_DFS_CREATE_FILE(ha, TEST, 0600, ha->dfs_dir, vha);
* 4. In qla2x00_dfs_remove(): * 4. In qla2x00_dfs_remove():
* QLA_DFS_REMOVE_FILE(ha, TEST); * QLA_DFS_REMOVE_FILE(ha, TEST);
*/ */
#define QLA_DFS_SETUP_RD(_name, _ctx_struct) \ #define QLA_DFS_SETUP_RD(_name) DEFINE_SHOW_ATTRIBUTE(qla_dfs_##_name)
static int \
qla_dfs_##_name##_open(struct inode *inode, struct file *file) \
{ \
_ctx_struct *__ctx = inode->i_private; \
\
return single_open(file, qla_dfs_##_name##_show, __ctx); \
} \
\
static const struct file_operations qla_dfs_##_name##_ops = { \
.open = qla_dfs_##_name##_open, \
.read = seq_read, \
.llseek = seq_lseek, \
.release = single_release, \
};
#define QLA_DFS_SETUP_RW(_name, _ctx_struct) \ #define QLA_DFS_SETUP_RW(_name) DEFINE_SHOW_STORE_ATTRIBUTE(qla_dfs_##_name)
static int \
qla_dfs_##_name##_open(struct inode *inode, struct file *file) \
{ \
_ctx_struct *__ctx = inode->i_private; \
\
return single_open(file, qla_dfs_##_name##_show, __ctx); \
} \
\
static const struct file_operations qla_dfs_##_name##_ops = { \
.open = qla_dfs_##_name##_open, \
.read = seq_read, \
.llseek = seq_lseek, \
.release = single_release, \
.write = qla_dfs_##_name##_write, \
};
#define QLA_DFS_ROOT_CREATE_FILE(_name, _perm, _ctx) \ #define QLA_DFS_ROOT_CREATE_FILE(_name, _perm, _ctx) \
do { \ do { \
if (!qla_dfs_##_name) \ if (!qla_dfs_##_name) \
qla_dfs_##_name = debugfs_create_file(#_name, \ qla_dfs_##_name = debugfs_create_file(#_name, \
_perm, qla2x00_dfs_root, _ctx, \ _perm, qla2x00_dfs_root, _ctx, \
&qla_dfs_##_name##_ops); \ &qla_dfs_##_name##_fops); \
} while (0) } while (0)
#define QLA_DFS_ROOT_REMOVE_FILE(_name) \ #define QLA_DFS_ROOT_REMOVE_FILE(_name) \
...@@ -587,7 +558,7 @@ static const struct file_operations qla_dfs_##_name##_ops = { \ ...@@ -587,7 +558,7 @@ static const struct file_operations qla_dfs_##_name##_ops = { \
do { \ do { \
(_struct)->dfs_##_name = debugfs_create_file(#_name, \ (_struct)->dfs_##_name = debugfs_create_file(#_name, \
_perm, _parent, _ctx, \ _perm, _parent, _ctx, \
&qla_dfs_##_name##_ops) \ &qla_dfs_##_name##_fops) \
} while (0) } while (0)
#define QLA_DFS_REMOVE_FILE(_struct, _name) \ #define QLA_DFS_REMOVE_FILE(_struct, _name) \
...@@ -598,14 +569,6 @@ static const struct file_operations qla_dfs_##_name##_ops = { \ ...@@ -598,14 +569,6 @@ static const struct file_operations qla_dfs_##_name##_ops = { \
} \ } \
} while (0) } while (0)
static int
qla_dfs_naqp_open(struct inode *inode, struct file *file)
{
struct scsi_qla_host *vha = inode->i_private;
return single_open(file, qla_dfs_naqp_show, vha);
}
static ssize_t static ssize_t
qla_dfs_naqp_write(struct file *file, const char __user *buffer, qla_dfs_naqp_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos) size_t count, loff_t *pos)
...@@ -653,15 +616,7 @@ qla_dfs_naqp_write(struct file *file, const char __user *buffer, ...@@ -653,15 +616,7 @@ qla_dfs_naqp_write(struct file *file, const char __user *buffer,
kfree(buf); kfree(buf);
return rc; return rc;
} }
QLA_DFS_SETUP_RW(naqp);
static const struct file_operations dfs_naqp_ops = {
.open = qla_dfs_naqp_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
.write = qla_dfs_naqp_write,
};
int int
qla2x00_dfs_setup(scsi_qla_host_t *vha) qla2x00_dfs_setup(scsi_qla_host_t *vha)
...@@ -707,7 +662,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha) ...@@ -707,7 +662,7 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)
if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha)) { if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha)) {
ha->tgt.dfs_naqp = debugfs_create_file("naqp", ha->tgt.dfs_naqp = debugfs_create_file("naqp",
0400, ha->dfs_dir, vha, &dfs_naqp_ops); 0400, ha->dfs_dir, vha, &qla_dfs_naqp_fops);
if (IS_ERR(ha->tgt.dfs_naqp)) { if (IS_ERR(ha->tgt.dfs_naqp)) {
ql_log(ql_log_warn, vha, 0xd011, ql_log(ql_log_warn, vha, 0xd011,
"Unable to create debugFS naqp node.\n"); "Unable to create debugFS naqp node.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment