]> err.no Git - linux-2.6/commitdiff
Amiga Zorro bus: kill resource_size_t warnings
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 1 May 2007 20:33:04 +0000 (22:33 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 5 May 2007 00:59:08 +0000 (17:59 -0700)
Kill resource_size_t warnings by casting resource_size_t to unsigned long when
formatting Zorro bus resources, as they are always 32-bit.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/zorro/proc.c
drivers/zorro/zorro-sysfs.c
drivers/zorro/zorro.c

index b3ce8859a586e58a6beb69b5aaa6fa4a86b7e288..2ce4cebc31d9d47e6465783a0fd11b06082ee7e9 100644 (file)
@@ -90,8 +90,9 @@ get_zorro_dev_info(char *buf, char **start, off_t pos, int count)
        for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) {
                struct zorro_dev *z = &zorro_autocon[slot];
                len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot,
-                             z->id, zorro_resource_start(z),
-                             zorro_resource_len(z), z->rom.er_Type);
+                             z->id, (unsigned long)zorro_resource_start(z),
+                             (unsigned long)zorro_resource_len(z),
+                             z->rom.er_Type);
                at += len;
                if (at >= pos) {
                        if (!*start) {
index 87c29d7b6c17aa969356bd8a67fcefc8ac552615..c3ba0ec334c45a419513343d7abd505633364482 100644 (file)
@@ -42,7 +42,8 @@ static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *
        struct zorro_dev *z = to_zorro_dev(dev);
 
        return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n",
-                      zorro_resource_start(z), zorro_resource_end(z),
+                      (unsigned long)zorro_resource_start(z),
+                      (unsigned long)zorro_resource_end(z),
                       zorro_resource_flags(z));
 }
 
index 0f2b40605b06c4bccb44cc9809de366a0bed8806..4cc42b64820cdb09e0ae5a6212feb9b5e8ed8528 100644 (file)
@@ -164,7 +164,8 @@ static int __init zorro_init(void)
        if (request_resource(zorro_find_parent_resource(z), &z->resource))
            printk(KERN_ERR "Zorro: Address space collision on device %s "
                   "[%lx:%lx]\n",
-                  z->name, zorro_resource_start(z), zorro_resource_end(z));
+                  z->name, (unsigned long)zorro_resource_start(z),
+                  (unsigned long)zorro_resource_end(z));
        sprintf(z->dev.bus_id, "%02x", i);
        z->dev.parent = &zorro_bus.dev;
        z->dev.bus = &zorro_bus_type;