Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / drivers / gpu / drm / sis / sis_drv.c

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 7dacc64..4fd1f06 100644 (file)
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -40,7 +40,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
        drm_sis_private_t *dev_priv;
        int ret;
 
-       dev_priv = drm_calloc(1, sizeof(drm_sis_private_t), DRM_MEM_DRIVER);
+       dev_priv = kzalloc(sizeof(drm_sis_private_t), GFP_KERNEL);
        if (dev_priv == NULL)
                return -ENOMEM;
 
@@ -48,7 +48,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
        dev_priv->chipset = chipset;
        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
        if (ret) {
-               drm_free(dev_priv, sizeof(dev_priv), DRM_MEM_DRIVER);
+               kfree(dev_priv);
        }
 
        return ret;
@@ -59,7 +59,7 @@ static int sis_driver_unload(struct drm_device *dev)
        drm_sis_private_t *dev_priv = dev->dev_private;
 
        drm_sman_takedown(&dev_priv->sman);
-       drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+       kfree(dev_priv);
 
        return 0;
 }
@@ -80,7 +80,7 @@ static struct drm_driver driver = {
                 .owner = THIS_MODULE,
                 .open = drm_open,
                 .release = drm_release,
-                .ioctl = drm_ioctl,
+                .unlocked_ioctl = drm_ioctl,
                 .mmap = drm_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,