Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / char / drm / i830_irq.c

diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c
index 5841f7674956b2873b8d5d15a39fc9c160d421d8..a33db5f0967fbbb798706ec6c3125347371b6f10 100644 (file)
--- a/drivers/char/drm/i830_irq.c
+++ b/drivers/char/drm/i830_irq.c
@@ -35,7 +35,7 @@
 
 irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
 {
-       drm_device_t *dev = (drm_device_t *) arg;
+       struct drm_device *dev = (struct drm_device *) arg;
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        u16 temp;
 
@@ -53,7 +53,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
        return IRQ_HANDLED;
 }
 
-static int i830_emit_irq(drm_device_t * dev)
+static int i830_emit_irq(struct drm_device * dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -70,7 +70,7 @@ static int i830_emit_irq(drm_device_t * dev)
        return atomic_read(&dev_priv->irq_emitted);
 }
 
-static int i830_wait_irq(drm_device_t * dev, int irq_nr)
+static int i830_wait_irq(struct drm_device * dev, int irq_nr)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        DECLARE_WAITQUEUE(entry, current);
@@ -114,29 +114,23 @@ static int i830_wait_irq(drm_device_t * dev, int irq_nr)
 
 /* Needs the lock as it touches the ring.
  */
-int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd,
-                 unsigned long arg)
+int i830_irq_emit(struct drm_device *dev, void *data,
+                 struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
        drm_i830_private_t *dev_priv = dev->dev_private;
-       drm_i830_irq_emit_t emit;
+       drm_i830_irq_emit_t *emit = data;
        int result;
 
-       LOCK_TEST_WITH_RETURN(dev, filp);
+       LOCK_TEST_WITH_RETURN(dev, file_priv);
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                return -EINVAL;
        }
 
-       if (copy_from_user
-           (&emit, (drm_i830_irq_emit_t __user *) arg, sizeof(emit)))
-               return -EFAULT;
-
        result = i830_emit_irq(dev);
 
-       if (copy_to_user(emit.irq_seq, &result, sizeof(int))) {
+       if (copy_to_user(emit->irq_seq, &result, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
                return -EFAULT;
        }
@@ -146,29 +140,23 @@ int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd,
 
 /* Doesn't need the hardware lock.
  */
-int i830_irq_wait(struct inode *inode, struct file *filp, unsigned int cmd,
-                 unsigned long arg)
+int i830_irq_wait(struct drm_device *dev, void *data,
+                 struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
        drm_i830_private_t *dev_priv = dev->dev_private;
-       drm_i830_irq_wait_t irqwait;
+       drm_i830_irq_wait_t *irqwait = data;
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                return -EINVAL;
        }
 
-       if (copy_from_user(&irqwait, (drm_i830_irq_wait_t __user *) arg,
-                          sizeof(irqwait)))
-               return -EFAULT;
-
-       return i830_wait_irq(dev, irqwait.irq_seq);
+       return i830_wait_irq(dev, irqwait->irq_seq);
 }
 
 /* drm_dma.h hooks
 */
-void i830_driver_irq_preinstall(drm_device_t * dev)
+void i830_driver_irq_preinstall(struct drm_device * dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
 
@@ -180,14 +168,14 @@ void i830_driver_irq_preinstall(drm_device_t * dev)
        init_waitqueue_head(&dev_priv->irq_queue);
 }
 
-void i830_driver_irq_postinstall(drm_device_t * dev)
+void i830_driver_irq_postinstall(struct drm_device * dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
 
        I830_WRITE16(I830REG_INT_ENABLE_R, 0x2);
 }
 
-void i830_driver_irq_uninstall(drm_device_t * dev)
+void i830_driver_irq_uninstall(struct drm_device * dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        if (!dev_priv)