drm/qxl: Don't use drm_device->dev_private

[linux-2.6-microblaze.git] / drivers / gpu / drm / qxl / qxl_debugfs.c

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index a4f4175..524d35b 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -39,7 +39,7 @@ static int
 qxl_debugfs_irq_received(struct seq_file *m, void *data)
 {
        struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct qxl_device *qdev = node->minor->dev->dev_private;
+       struct qxl_device *qdev = to_qxl(node->minor->dev);
 
        seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
        seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
@@ -53,7 +53,7 @@ static int
 qxl_debugfs_buffers_info(struct seq_file *m, void *data)
 {
        struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct qxl_device *qdev = node->minor->dev->dev_private;
+       struct qxl_device *qdev = to_qxl(node->minor->dev);
        struct qxl_bo *bo;
 
        list_for_each_entry(bo, &qdev->gem.objects, list) {
@@ -79,36 +79,29 @@ static struct drm_info_list qxl_debugfs_list[] = {
 #define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
 #endif
 
-int
+void
 qxl_debugfs_init(struct drm_minor *minor)
 {
 #if defined(CONFIG_DEBUG_FS)
-       int r;
-       struct qxl_device *dev =
-               (struct qxl_device *) minor->dev->dev_private;
+       struct qxl_device *dev = to_qxl(minor->dev);
 
        drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
                                 minor->debugfs_root, minor);
 
-       r = qxl_ttm_debugfs_init(dev);
-       if (r) {
-               DRM_ERROR("Failed to init TTM debugfs\n");
-               return r;
-       }
+       qxl_ttm_debugfs_init(dev);
 #endif
-       return 0;
 }
 
-int qxl_debugfs_add_files(struct qxl_device *qdev,
-                         struct drm_info_list *files,
-                         unsigned int nfiles)
+void qxl_debugfs_add_files(struct qxl_device *qdev,
+                          struct drm_info_list *files,
+                          unsigned int nfiles)
 {
        unsigned int i;
 
        for (i = 0; i < qdev->debugfs_count; i++) {
                if (qdev->debugfs[i].files == files) {
                        /* Already registered */
-                       return 0;
+                       return;
                }
        }
 
@@ -116,7 +109,7 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
        if (i > QXL_DEBUGFS_MAX_COMPONENTS) {
                DRM_ERROR("Reached maximum number of debugfs components.\n");
                DRM_ERROR("Report so we increase QXL_DEBUGFS_MAX_COMPONENTS.\n");
-               return -EINVAL;
+               return;
        }
        qdev->debugfs[qdev->debugfs_count].files = files;
        qdev->debugfs[qdev->debugfs_count].num_files = nfiles;
@@ -126,5 +119,4 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
                                 qdev->ddev.primary->debugfs_root,
                                 qdev->ddev.primary);
 #endif
-       return 0;
 }