Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31817576 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f4d86754

drivers/zorro/proc.c

+3 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/zorro/zorro-sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

}

drivers/zorro/zorro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;