drm: fix radeon warnings on 64-bit

From: Andrew Morton <akpm@osdl.org>

drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture':
drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg
(arg 3)
drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg
(arg 3)
drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg
(arg 3)

sizeof() doesn't return an int.

Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index e9d8ec3a0994484271d3e4d92138301b64d3c39f..7bc27516d42550d7cde72a37a24227391f59ae26 100644 (file)
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -1651,7 +1651,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
                        if (tex->height == 1) {
                                if (tex_width >= 64 || tex_width <= 16) {
                                        RADEON_COPY_MT(buffer, data,
-                                                tex_width * sizeof(u32));
+                                               (int)(tex_width * sizeof(u32)));
                                } else if (tex_width == 32) {
                                        RADEON_COPY_MT(buffer, data, 16);
                                        RADEON_COPY_MT(buffer + 8,
@@ -1659,7 +1659,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
                                }
                        } else if (tex_width >= 64 || tex_width == 16) {
                                RADEON_COPY_MT(buffer, data,
-                                              dwords * sizeof(u32));
+                                              (int)(dwords * sizeof(u32)));
                        } else if (tex_width < 16) {
                                for (i = 0; i < tex->height; i++) {
                                        RADEON_COPY_MT(buffer, data, tex_width);
@@ -1687,7 +1687,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
                                 * can upload it directly.
                                 */
                                RADEON_COPY_MT(buffer, data,
-                                              dwords * sizeof(u32));
+                                              (int)(dwords * sizeof(u32)));
                        } else {
                                /* Texture image width is less than the minimum, so we
                                 * need to pad out each image scanline to the minimum