nouveau: nuke internal typedefs, and drm_device_t use.

1 files changed, 29 insertions, 29 deletions

diff --git a/shared-core/nv50_fifo.c b/shared-core/nv50_fifo.c
index ee1fb887..feab24c4 100644
--- a/shared-core/nv50_fifo.c
+++ b/shared-core/nv50_fifo.c
@@ -29,18 +29,18 @@
 #include "nouveau_drv.h"
 
 typedef struct {
-	nouveau_gpuobj_ref_t *thingo;
-	nouveau_gpuobj_ref_t *dummyctx;
+	struct nouveau_gpuobj_ref *thingo;
+	struct nouveau_gpuobj_ref *dummyctx;
 } nv50_fifo_priv;
 
 #define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50)
 
 static void
-nv50_fifo_init_thingo(drm_device_t *dev)
+nv50_fifo_init_thingo(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
-	nouveau_gpuobj_ref_t *thingo = priv->thingo;
+	struct nouveau_gpuobj_ref *thingo = priv->thingo;
 	int i, fi=2;
 
 	DRM_DEBUG("\n");
@@ -60,9 +60,9 @@ nv50_fifo_init_thingo(drm_device_t *dev)
 }
 
 static int
-nv50_fifo_channel_enable(drm_device_t *dev, int channel)
+nv50_fifo_channel_enable(struct drm_device *dev, int channel)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_fifo *chan = dev_priv->fifos[channel];
 
 	DRM_DEBUG("ch%d\n", channel);
@@ -88,9 +88,9 @@ nv50_fifo_channel_enable(drm_device_t *dev, int channel)
 }
 
 static void
-nv50_fifo_channel_disable(drm_device_t *dev, int channel, int nt)
+nv50_fifo_channel_disable(struct drm_device *dev, int channel, int nt)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 	DRM_DEBUG("ch%d, nt=%d\n", channel, nt);
 
@@ -106,9 +106,9 @@ nv50_fifo_channel_disable(drm_device_t *dev, int channel, int nt)
 }
 
 static void
-nv50_fifo_init_reset(drm_device_t *dev)
+nv50_fifo_init_reset(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	uint32_t pmc_e;
 
 	DRM_DEBUG("\n");
@@ -120,7 +120,7 @@ nv50_fifo_init_reset(drm_device_t *dev)
 }
 
 static void
-nv50_fifo_init_context_table(drm_device_t *dev)
+nv50_fifo_init_context_table(struct drm_device *dev)
 {
 	int i;
 
@@ -132,9 +132,9 @@ nv50_fifo_init_context_table(drm_device_t *dev)
 }
 
 static void
-nv50_fifo_init_regs__nv(drm_device_t *dev)
+nv50_fifo_init_regs__nv(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 	DRM_DEBUG("\n");
 
@@ -142,9 +142,9 @@ nv50_fifo_init_regs__nv(drm_device_t *dev)
 }
 
 static int
-nv50_fifo_init_regs(drm_device_t *dev)
+nv50_fifo_init_regs(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
 	int ret;
 
@@ -176,9 +176,9 @@ nv50_fifo_init_regs(drm_device_t *dev)
 }
 
 int
-nv50_fifo_init(drm_device_t *dev)
+nv50_fifo_init(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	nv50_fifo_priv *priv;
 	int ret;
 
@@ -207,9 +207,9 @@ nv50_fifo_init(drm_device_t *dev)
 }
 
 void
-nv50_fifo_takedown(drm_device_t *dev)
+nv50_fifo_takedown(struct drm_device *dev)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
 
 	DRM_DEBUG("\n");
@@ -225,11 +225,11 @@ nv50_fifo_takedown(drm_device_t *dev)
 }
 
 int
-nv50_fifo_create_context(drm_device_t *dev, int channel)
+nv50_fifo_create_context(struct drm_device *dev, int channel)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_fifo *chan = dev_priv->fifos[channel];
-	nouveau_gpuobj_t *ramfc = NULL;
+	struct nouveau_gpuobj *ramfc = NULL;
 	int ret;
 
 	DRM_DEBUG("ch%d\n", channel);
@@ -283,9 +283,9 @@ nv50_fifo_create_context(drm_device_t *dev, int channel)
 }
 
 void
-nv50_fifo_destroy_context(drm_device_t *dev, int channel)
+nv50_fifo_destroy_context(struct drm_device *dev, int channel)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_fifo *chan = dev_priv->fifos[channel];
 
 	DRM_DEBUG("ch%d\n", channel);
@@ -295,11 +295,11 @@ nv50_fifo_destroy_context(drm_device_t *dev, int channel)
 }
 
 int
-nv50_fifo_load_context(drm_device_t *dev, int channel)
+nv50_fifo_load_context(struct drm_device *dev, int channel)
 {
-	drm_nouveau_private_t *dev_priv = dev->dev_private;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_fifo *chan = dev_priv->fifos[channel];
-	nouveau_gpuobj_t *ramfc = chan->ramfc->gpuobj;
+	struct nouveau_gpuobj *ramfc = chan->ramfc->gpuobj;
 
 	DRM_DEBUG("ch%d\n", channel);
 
@@ -324,7 +324,7 @@ nv50_fifo_load_context(drm_device_t *dev, int channel)
 }
 
 int
-nv50_fifo_save_context(drm_device_t *dev, int channel)
+nv50_fifo_save_context(struct drm_device *dev, int channel)
 {
 	DRM_DEBUG("ch%d\n", channel);
 	DRM_ERROR("stub!\n");