Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c9d524 authored by Noralf Trønnes's avatar Noralf Trønnes Committed by Gerd Hoffmann
Browse files

drm/qxl: Remove qxl_debugfs_remove_files() 



drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so it's not necessary to call drm_debugfs_remove_files().

Cc: airlied@linux.ie
Cc: kraxel@redhat.com
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170307204924.1002-4-noralf@tronnes.org



[ kraxel: solved conflict ]

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 1bdb5d5b

drivers/gpu/drm/qxl/qxl_debugfs.c

+0 −13
Original line number Diff line number Diff line
@@ -129,16 +129,3 @@ int qxl_debugfs_add_files(struct qxl_device *qdev, 
#endif

	return 0;

}
 


void qxl_debugfs_remove_files(struct qxl_device *qdev)

{

#if defined(CONFIG_DEBUG_FS)

	unsigned i;



	for (i = 0; i < qdev->debugfs_count; i++) {

		drm_debugfs_remove_files(qdev->debugfs[i].files,

					 qdev->debugfs[i].num_files,

					 qdev->ddev.primary);

	}

#endif

}

drivers/gpu/drm/qxl/qxl_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ int qxl_debugfs_add_files(struct qxl_device *rdev, 
			     struct drm_info_list *files,

			     unsigned nfiles);

int qxl_debugfs_fence_init(struct qxl_device *rdev);

void qxl_debugfs_remove_files(struct qxl_device *qdev);



struct qxl_device;

drivers/gpu/drm/qxl/qxl_kms.c

+0 −1
Original line number Diff line number Diff line
@@ -262,5 +262,4 @@ void qxl_device_fini(struct qxl_device *qdev) 
	iounmap(qdev->ram_header);

	iounmap(qdev->rom);

	qdev->rom = NULL;

	qxl_debugfs_remove_files(qdev);

}