diff options
author | Noralf Trønnes <noralf@tronnes.org> | 2017-01-26 17:56:14 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-27 09:26:32 -0500 |
commit | c8e73d1a2645db6eddda0d30b891f7f719f2b987 (patch) | |
tree | cf79db0797de86b9b59ae5d2d173ef87d3833739 | |
parent | c259e81bcd0e7b7e6ecdde4d5d4ce26aed409575 (diff) |
drm/radeon: Remove drm_debugfs_remove_files() call
drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so it's not necessary to call drm_debugfs_remove_files().
Cc: alexander.deucher@amd.com
Cc: christian.koenig@amd.com
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-13-noralf@tronnes.org
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 8a1df2a1afbd..4b0c388be3f5 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -1549,8 +1549,6 @@ failed: | |||
1549 | return r; | 1549 | return r; |
1550 | } | 1550 | } |
1551 | 1551 | ||
1552 | static void radeon_debugfs_remove_files(struct radeon_device *rdev); | ||
1553 | |||
1554 | /** | 1552 | /** |
1555 | * radeon_device_fini - tear down the driver | 1553 | * radeon_device_fini - tear down the driver |
1556 | * | 1554 | * |
@@ -1577,7 +1575,6 @@ void radeon_device_fini(struct radeon_device *rdev) | |||
1577 | rdev->rmmio = NULL; | 1575 | rdev->rmmio = NULL; |
1578 | if (rdev->family >= CHIP_BONAIRE) | 1576 | if (rdev->family >= CHIP_BONAIRE) |
1579 | radeon_doorbell_fini(rdev); | 1577 | radeon_doorbell_fini(rdev); |
1580 | radeon_debugfs_remove_files(rdev); | ||
1581 | } | 1578 | } |
1582 | 1579 | ||
1583 | 1580 | ||
@@ -1954,16 +1951,3 @@ int radeon_debugfs_add_files(struct radeon_device *rdev, | |||
1954 | #endif | 1951 | #endif |
1955 | return 0; | 1952 | return 0; |
1956 | } | 1953 | } |
1957 | |||
1958 | static void radeon_debugfs_remove_files(struct radeon_device *rdev) | ||
1959 | { | ||
1960 | #if defined(CONFIG_DEBUG_FS) | ||
1961 | unsigned i; | ||
1962 | |||
1963 | for (i = 0; i < rdev->debugfs_count; i++) { | ||
1964 | drm_debugfs_remove_files(rdev->debugfs[i].files, | ||
1965 | rdev->debugfs[i].num_files, | ||
1966 | rdev->ddev->primary); | ||
1967 | } | ||
1968 | #endif | ||
1969 | } | ||