aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i830_irq.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 02:09:54 -0400
committerDave Airlie <airlied@linux.ie>2007-07-11 02:09:54 -0400
commiteddca551a3e7be2fed54282f255f18efe9ead131 (patch)
tree7beb8c03af45cc9659a3ff5e6483f2ed7c31527d /drivers/char/drm/i830_irq.c
parent84b1fd103dbbe01b5905db1444d3fc8afa9a7207 (diff)
drm: fixup other drivers for typedef removals
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i830_irq.c')
-rw-r--r--drivers/char/drm/i830_irq.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c
index 5841f7674956..a1b5c63c3c3e 100644
--- a/drivers/char/drm/i830_irq.c
+++ b/drivers/char/drm/i830_irq.c
@@ -35,7 +35,7 @@
35 35
36irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS) 36irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
37{ 37{
38 drm_device_t *dev = (drm_device_t *) arg; 38 struct drm_device *dev = (struct drm_device *) arg;
39 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; 39 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
40 u16 temp; 40 u16 temp;
41 41
@@ -53,7 +53,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
53 return IRQ_HANDLED; 53 return IRQ_HANDLED;
54} 54}
55 55
56static int i830_emit_irq(drm_device_t * dev) 56static int i830_emit_irq(struct drm_device * dev)
57{ 57{
58 drm_i830_private_t *dev_priv = dev->dev_private; 58 drm_i830_private_t *dev_priv = dev->dev_private;
59 RING_LOCALS; 59 RING_LOCALS;
@@ -70,7 +70,7 @@ static int i830_emit_irq(drm_device_t * dev)
70 return atomic_read(&dev_priv->irq_emitted); 70 return atomic_read(&dev_priv->irq_emitted);
71} 71}
72 72
73static int i830_wait_irq(drm_device_t * dev, int irq_nr) 73static int i830_wait_irq(struct drm_device * dev, int irq_nr)
74{ 74{
75 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; 75 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
76 DECLARE_WAITQUEUE(entry, current); 76 DECLARE_WAITQUEUE(entry, current);
@@ -117,8 +117,8 @@ static int i830_wait_irq(drm_device_t * dev, int irq_nr)
117int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd, 117int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd,
118 unsigned long arg) 118 unsigned long arg)
119{ 119{
120 drm_file_t *priv = filp->private_data; 120 struct drm_file *priv = filp->private_data;
121 drm_device_t *dev = priv->head->dev; 121 struct drm_device *dev = priv->head->dev;
122 drm_i830_private_t *dev_priv = dev->dev_private; 122 drm_i830_private_t *dev_priv = dev->dev_private;
123 drm_i830_irq_emit_t emit; 123 drm_i830_irq_emit_t emit;
124 int result; 124 int result;
@@ -149,8 +149,8 @@ int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd,
149int i830_irq_wait(struct inode *inode, struct file *filp, unsigned int cmd, 149int i830_irq_wait(struct inode *inode, struct file *filp, unsigned int cmd,
150 unsigned long arg) 150 unsigned long arg)
151{ 151{
152 drm_file_t *priv = filp->private_data; 152 struct drm_file *priv = filp->private_data;
153 drm_device_t *dev = priv->head->dev; 153 struct drm_device *dev = priv->head->dev;
154 drm_i830_private_t *dev_priv = dev->dev_private; 154 drm_i830_private_t *dev_priv = dev->dev_private;
155 drm_i830_irq_wait_t irqwait; 155 drm_i830_irq_wait_t irqwait;
156 156
@@ -168,7 +168,7 @@ int i830_irq_wait(struct inode *inode, struct file *filp, unsigned int cmd,
168 168
169/* drm_dma.h hooks 169/* drm_dma.h hooks
170*/ 170*/
171void i830_driver_irq_preinstall(drm_device_t * dev) 171void i830_driver_irq_preinstall(struct drm_device * dev)
172{ 172{
173 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; 173 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
174 174
@@ -180,14 +180,14 @@ void i830_driver_irq_preinstall(drm_device_t * dev)
180 init_waitqueue_head(&dev_priv->irq_queue); 180 init_waitqueue_head(&dev_priv->irq_queue);
181} 181}
182 182
183void i830_driver_irq_postinstall(drm_device_t * dev) 183void i830_driver_irq_postinstall(struct drm_device * dev)
184{ 184{
185 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; 185 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
186 186
187 I830_WRITE16(I830REG_INT_ENABLE_R, 0x2); 187 I830_WRITE16(I830REG_INT_ENABLE_R, 0x2);
188} 188}
189 189
190void i830_driver_irq_uninstall(drm_device_t * dev) 190void i830_driver_irq_uninstall(struct drm_device * dev)
191{ 191{
192 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; 192 drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
193 if (!dev_priv) 193 if (!dev_priv)