don't open-code file_inode()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3161d77bf299..3c2858972217 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2501,7 +2501,7 @@ static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev)
 static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
         bool pm_pg_lock, use_bank;
@@ -2570,7 +2570,7 @@ end:
 static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf,
                                          size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2601,7 +2601,7 @@ static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf,
 static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2628,7 +2628,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user *buf,
                                          size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2656,7 +2656,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user
 static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2683,7 +2683,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user *buf,
                                          size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2711,7 +2711,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
 static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2738,7 +2738,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *buf,
                                          size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -2766,7 +2766,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *
 static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
         uint32_t *config, no_regs = 0;
@@ -2836,7 +2836,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         int idx, r;
         int32_t value;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 3cb5e903cd62..2636f619569e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -283,7 +283,7 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
 static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_ring *ring = (struct amdgpu_ring*)f->f_inode->i_private;
+        struct amdgpu_ring *ring = file_inode(f)->i_private;
         int r, i;
         uint32_t value, result, early[3];
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index dcaf691f56b5..a5d00ef2b421 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1412,7 +1412,7 @@ static const struct drm_info_list amdgpu_ttm_debugfs_list[] = {
 static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf,
                                     size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;
 
@@ -1456,7 +1456,7 @@ static const struct file_operations amdgpu_ttm_vram_fops = {
 static ssize_t amdgpu_ttm_gtt_read(struct file *f, char __user *buf,
                                    size_t size, loff_t *pos)
 {
-        struct amdgpu_device *adev = f->f_inode->i_private;
+        struct amdgpu_device *adev = file_inode(f)->i_private;
         ssize_t result = 0;
         int r;