- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / drm / radeon_cp.c

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 43834b9..96d3300 100644 (file)
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -28,7 +28,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#include "radeon.h"
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -1006,7 +1005,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
        drm_radeon_private_t *dev_priv;
        DRM_DEBUG( "\n" );
 
-       dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
+       dev_priv = drm_alloc( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
        if ( dev_priv == NULL )
                return DRM_ERR(ENOMEM);
 
@@ -1233,7 +1232,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
        dev_priv->ring.end = ((u32 *)dev_priv->cp_ring->handle
                              + init->ring_size / sizeof(u32));
        dev_priv->ring.size = init->ring_size;
-       dev_priv->ring.size_l2qw = DRM(order)( init->ring_size / 8 );
+       dev_priv->ring.size_l2qw = drm_order( init->ring_size / 8 );
 
        dev_priv->ring.tail_mask =
                (dev_priv->ring.size / sizeof(u32)) - 1;
@@ -1247,7 +1246,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
        } else
 #endif
        {
-               if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart,
+               if (!drm_ati_pcigart_init( dev, &dev_priv->phys_pci_gart,
                                            &dev_priv->bus_pci_gart)) {
                        DRM_ERROR( "failed to init PCI GART!\n" );
                        dev->dev_private = (void *)dev_priv;
@@ -1279,7 +1278,7 @@ int radeon_do_cleanup_cp( drm_device_t *dev )
         * may not have been called from userspace and after dev_private
         * is freed, it's too late.
         */
-       if ( dev->irq_enabled ) DRM(irq_uninstall)(dev);
+       if ( dev->irq_enabled ) drm_irq_uninstall(dev);
 
        if ( dev->dev_private ) {
                drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1295,13 +1294,13 @@ int radeon_do_cleanup_cp( drm_device_t *dev )
                } else
 #endif
                {
-                       if (!DRM(ati_pcigart_cleanup)( dev,
+                       if (!drm_ati_pcigart_cleanup( dev,
                                                dev_priv->phys_pci_gart,
                                                dev_priv->bus_pci_gart ))
                                DRM_ERROR( "failed to cleanup PCI GART!\n" );
                }
 
-               DRM(free)( dev->dev_private, sizeof(drm_radeon_private_t),
+               drm_free( dev->dev_private, sizeof(drm_radeon_private_t),
                           DRM_MEM_DRIVER );
                dev->dev_private = NULL;
        }