Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 318175766e7688ba52cdf771d37e98a1e4759f98

Authored by Geert Uytterhoeven
Committed by Linus Torvalds
1 parent f4d86754f9
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Amiga Zorro bus: kill resource_size_t warnings 

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>

Showing 3 changed files with 7 additions and 4 deletions Side-by-side Diff

drivers/zorro/proc.c
Diff comments   View file @ 3181757
... ... @@ -90,8 +90,9 @@
90 90 for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) {
91 91 struct zorro_dev *z = &zorro_autocon[slot];
92 92 len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot,
93   - z->id, zorro_resource_start(z),
94   - zorro_resource_len(z), z->rom.er_Type);
  93 + z->id, (unsigned long)zorro_resource_start(z),
  94 + (unsigned long)zorro_resource_len(z),
  95 + z->rom.er_Type);
95 96 at += len;
96 97 if (at >= pos) {
97 98 if (!*start) {
drivers/zorro/zorro-sysfs.c
Diff comments   View file @ 3181757
... ... @@ -42,7 +42,8 @@
42 42 struct zorro_dev *z = to_zorro_dev(dev);
43 43  
44 44 return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n",
45   - zorro_resource_start(z), zorro_resource_end(z),
  45 + (unsigned long)zorro_resource_start(z),
  46 + (unsigned long)zorro_resource_end(z),
46 47 zorro_resource_flags(z));
47 48 }
48 49  
drivers/zorro/zorro.c
Diff comments   View file @ 3181757
... ... @@ -164,7 +164,8 @@
164 164 if (request_resource(zorro_find_parent_resource(z), &z->resource))
165 165 printk(KERN_ERR "Zorro: Address space collision on device %s "
166 166 "[%lx:%lx]\n",
167   - z->name, zorro_resource_start(z), zorro_resource_end(z));
  167 + z->name, (unsigned long)zorro_resource_start(z),
  168 + (unsigned long)zorro_resource_end(z));
168 169 sprintf(z->dev.bus_id, "%02x", i);
169 170 z->dev.parent = &zorro_bus.dev;
170 171 z->dev.bus = &zorro_bus_type;