lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/21] drm/nouveau: remove checks for return value of debugfs functions
    Date
    Since 987d65d01356 (drm: debugfs: make
    drm_debugfs_create_files() never fail), there is no need to ever check
    for the the return value of debugfs_create_file() and
    drm_debugfs_create_files(). Therefore, remove unnecessary checks and
    error handling in nouveau_drm_debugfs_init.

    These changes also enable nouveau_drm_debugfs_init() to be declared
    as void.

    Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
    ---
    drivers/gpu/drm/nouveau/nouveau_debugfs.c | 26 +++++++++--------------
    drivers/gpu/drm/nouveau/nouveau_debugfs.h | 5 ++---
    2 files changed, 12 insertions(+), 19 deletions(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    index 7dfbbbc1beea..63cb5e432f8a 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    @@ -217,39 +217,33 @@ static const struct nouveau_debugfs_files {
    {"pstate", &nouveau_pstate_fops},
    };

    -int
    +void
    nouveau_drm_debugfs_init(struct drm_minor *minor)
    {
    struct nouveau_drm *drm = nouveau_drm(minor->dev);
    struct dentry *dentry;
    - int i, ret;
    + int i;

    for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) {
    - dentry = debugfs_create_file(nouveau_debugfs_files[i].name,
    - S_IRUGO | S_IWUSR,
    - minor->debugfs_root, minor->dev,
    - nouveau_debugfs_files[i].fops);
    - if (!dentry)
    - return -ENOMEM;
    + debugfs_create_file(nouveau_debugfs_files[i].name,
    + S_IRUGO | S_IWUSR,
    + minor->debugfs_root, minor->dev,
    + nouveau_debugfs_files[i].fops);
    }

    - ret = drm_debugfs_create_files(nouveau_debugfs_list,
    - NOUVEAU_DEBUGFS_ENTRIES,
    - minor->debugfs_root, minor);
    - if (ret)
    - return ret;
    + drm_debugfs_create_files(nouveau_debugfs_list,
    + NOUVEAU_DEBUGFS_ENTRIES,
    + minor->debugfs_root, minor);

    /* Set the size of the vbios since we know it, and it's confusing to
    * userspace if it wants to seek() but the file has a length of 0
    */
    dentry = debugfs_lookup("vbios.rom", minor->debugfs_root);
    if (!dentry)
    - return 0;
    + return;

    d_inode(dentry)->i_size = drm->vbios.length;
    dput(dentry);
    -
    - return 0;
    }

    int
    diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
    index 8909c010e8ea..ccb842d9da87 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
    +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
    @@ -18,14 +18,13 @@ nouveau_debugfs(struct drm_device *dev)
    return nouveau_drm(dev)->debugfs;
    }

    -extern int nouveau_drm_debugfs_init(struct drm_minor *);
    +extern void nouveau_drm_debugfs_init(struct drm_minor *);
    extern int nouveau_debugfs_init(struct nouveau_drm *);
    extern void nouveau_debugfs_fini(struct nouveau_drm *);
    #else
    -static inline int
    +static inline void
    nouveau_drm_debugfs_init(struct drm_minor *minor)
    {
    - return 0;
    }

    static inline int
    --
    2.25.0
    \
     
     \ /
      Last update: 2020-02-27 13:03    [W:3.194 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site