2 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index 8cd45c8592bb..f057cbad2ebe 100644
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -30,6 +30,10 @@
 #define DRIVER_MINOR 0
 #define DRIVER_PATCHLEVEL 0
 
+struct tegra_drm_file {
+        struct list_head contexts;
+};
+
 struct host1x_subdev {
         struct host1x_client *client;
         struct device_node *np;
@@ -290,7 +294,7 @@ static int tegra_drm_unload(struct drm_device *drm)
 
 static int tegra_drm_open(struct drm_device *drm, struct drm_file *filp)
 {
-        struct host1x_drm_file *fpriv;
+        struct tegra_drm_file *fpriv;
 
         fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
         if (!fpriv)
@@ -316,8 +320,8 @@ static void tegra_drm_lastclose(struct drm_device *drm)
 }
 
 #ifdef CONFIG_DRM_TEGRA_STAGING
-static bool host1x_drm_file_owns_context(struct host1x_drm_file *file,
-                                         struct host1x_drm_context *context)
+static bool tegra_drm_file_owns_context(struct tegra_drm_file *file,
+                                        struct host1x_drm_context *context)
 {
         struct host1x_drm_context *ctx;
 
@@ -406,7 +410,7 @@ static int tegra_syncpt_wait(struct drm_device *drm, void *data,
 static int tegra_open_channel(struct drm_device *drm, void *data,
                               struct drm_file *file)
 {
-        struct host1x_drm_file *fpriv = file->driver_priv;
+        struct tegra_drm_file *fpriv = file->driver_priv;
         struct tegra_drm *tegra = drm->dev_private;
         struct drm_tegra_open_channel *args = data;
         struct host1x_drm_context *context;
@@ -437,11 +441,11 @@ static int tegra_close_channel(struct drm_device *drm, void *data,
                                struct drm_file *file)
 {
         struct drm_tegra_close_channel *args = data;
-        struct host1x_drm_file *fpriv = file->driver_priv;
+        struct tegra_drm_file *fpriv = file->driver_priv;
         struct host1x_drm_context *context =
                 (struct host1x_drm_context *)(uintptr_t)args->context;
 
-        if (!host1x_drm_file_owns_context(fpriv, context))
+        if (!tegra_drm_file_owns_context(fpriv, context))
                 return -EINVAL;
 
         list_del(&context->list);
@@ -453,13 +457,13 @@ static int tegra_close_channel(struct drm_device *drm, void *data,
 static int tegra_get_syncpt(struct drm_device *drm, void *data,
                             struct drm_file *file)
 {
+        struct tegra_drm_file *fpriv = file->driver_priv;
         struct drm_tegra_get_syncpt *args = data;
-        struct host1x_drm_file *fpriv = file->driver_priv;
         struct host1x_drm_context *context =
                 (struct host1x_drm_context *)(uintptr_t)args->context;
         struct host1x_syncpt *syncpt;
 
-        if (!host1x_drm_file_owns_context(fpriv, context))
+        if (!tegra_drm_file_owns_context(fpriv, context))
                 return -ENODEV;
 
         if (args->index >= context->client->num_syncpts)
@@ -474,12 +478,12 @@ static int tegra_get_syncpt(struct drm_device *drm, void *data,
 static int tegra_submit(struct drm_device *drm, void *data,
                         struct drm_file *file)
 {
+        struct tegra_drm_file *fpriv = file->driver_priv;
         struct drm_tegra_submit *args = data;
-        struct host1x_drm_file *fpriv = file->driver_priv;
         struct host1x_drm_context *context =
                 (struct host1x_drm_context *)(uintptr_t)args->context;
 
-        if (!host1x_drm_file_owns_context(fpriv, context))
+        if (!tegra_drm_file_owns_context(fpriv, context))
                 return -ENODEV;
 
         return context->client->ops->submit(context, args, drm, file);
@@ -558,7 +562,7 @@ static void tegra_drm_disable_vblank(struct drm_device *drm, int pipe)
 
 static void tegra_drm_preclose(struct drm_device *drm, struct drm_file *file)
 {
-        struct host1x_drm_file *fpriv = file->driver_priv;
+        struct tegra_drm_file *fpriv = file->driver_priv;
         struct host1x_drm_context *context, *tmp;
         struct drm_crtc *crtc;
 
diff --git a/drivers/gpu/host1x/drm/drm.h b/drivers/gpu/host1x/drm/drm.h
index 858bfc0db78a..74869d3e2d8c 100644
--- a/drivers/gpu/host1x/drm/drm.h
+++ b/drivers/gpu/host1x/drm/drm.h
@@ -63,10 +63,6 @@ struct host1x_client_ops {
                       struct drm_file *file);
 };
 
-struct host1x_drm_file {
-        struct list_head contexts;
-};
-
 struct host1x_client {
         struct tegra_drm *tegra;
         struct device *dev;