Merge branch 'master' into for-next

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

diff --git a/drivers/gpu/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c
index 463aed9..3466458 100644 (file)
--- a/drivers/gpu/drm/drm_sman.c
+++ b/drivers/gpu/drm/drm_sman.c
@@ -59,9 +59,7 @@ drm_sman_init(struct drm_sman * sman, unsigned int num_managers,
 {
        int ret = 0;
 
-       sman->mm = (struct drm_sman_mm *) kcalloc(num_managers,
-                                                 sizeof(*sman->mm),
-                                                 GFP_KERNEL);
+       sman->mm = kcalloc(num_managers, sizeof(*sman->mm), GFP_KERNEL);
        if (!sman->mm) {
                ret = -ENOMEM;
                goto out;