lkml.org 
[lkml]   [2023]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 3/3] scsi: qla2xxx: Use DEFINE_SHOW_STORE_ATTRIBUTE() helper for debugfs
    Date
    Use DEFINE_SHOW_STORE_ATTRIBUTE() helper for read-write file to reduce some
    duplicated code.

    Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
    Co-developed-by: Xingui Yang <yangxingui@huawei.com>
    Signed-off-by: Xingui Yang <yangxingui@huawei.com>
    ---
    drivers/scsi/qla2xxx/qla_dfs.c | 59 ++++------------------------------
    1 file changed, 7 insertions(+), 52 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
    index f060e593685d..debb14d71e8a 100644
    --- a/drivers/scsi/qla2xxx/qla_dfs.c
    +++ b/drivers/scsi/qla2xxx/qla_dfs.c
    @@ -528,51 +528,22 @@ qla_dfs_naqp_show(struct seq_file *s, void *unused)
    *
    * Example for creating "TEST" sysfs file:
    * 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():
    * QLA_DFS_CREATE_FILE(ha, TEST, 0600, ha->dfs_dir, vha);
    * 4. In qla2x00_dfs_remove():
    * QLA_DFS_REMOVE_FILE(ha, TEST);
    */
    -#define QLA_DFS_SETUP_RD(_name, _ctx_struct) \
    -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_RD(_name) DEFINE_SHOW_ATTRIBUTE(qla_dfs_##_name)

    -#define QLA_DFS_SETUP_RW(_name, _ctx_struct) \
    -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_SETUP_RW(_name) DEFINE_SHOW_STORE_ATTRIBUTE(qla_dfs_##_name)

    #define QLA_DFS_ROOT_CREATE_FILE(_name, _perm, _ctx) \
    do { \
    if (!qla_dfs_##_name) \
    qla_dfs_##_name = debugfs_create_file(#_name, \
    _perm, qla2x00_dfs_root, _ctx, \
    - &qla_dfs_##_name##_ops); \
    + &qla_dfs_##_name##_fops); \
    } while (0)

    #define QLA_DFS_ROOT_REMOVE_FILE(_name) \
    @@ -587,7 +558,7 @@ static const struct file_operations qla_dfs_##_name##_ops = { \
    do { \
    (_struct)->dfs_##_name = debugfs_create_file(#_name, \
    _perm, _parent, _ctx, \
    - &qla_dfs_##_name##_ops) \
    + &qla_dfs_##_name##_fops) \
    } while (0)

    #define QLA_DFS_REMOVE_FILE(_struct, _name) \
    @@ -598,14 +569,6 @@ static const struct file_operations qla_dfs_##_name##_ops = { \
    } \
    } 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
    qla_dfs_naqp_write(struct file *file, const char __user *buffer,
    size_t count, loff_t *pos)
    @@ -653,15 +616,7 @@ qla_dfs_naqp_write(struct file *file, const char __user *buffer,
    kfree(buf);
    return rc;
    }
    -
    -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,
    -};
    -
    +QLA_DFS_SETUP_RW(naqp);

    int
    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)) {
    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 (!ha->tgt.dfs_naqp) {
    ql_log(ql_log_warn, vha, 0xd011,
    "Unable to create debugFS naqp node.\n");
    --
    2.17.1
    \
     
     \ /
      Last update: 2023-09-05 18:19    [W:5.229 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site