Commit 4f1296a5 authored by David S. Miller's avatar David S. Miller

[SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c

resource_size_t can be either a u64 or a u32, and we can't
really know for sure, so when printing such a value out
always use long-long printf formatting and cast the argument
to that type.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7bcd4dae
...@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up) ...@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
if (up->port.type == PORT_UNKNOWN) if (up->port.type == PORT_UNKNOWN)
return -ENODEV; return -ENODEV;
printk("%s: %s port at %lx, irq %u\n", printk("%s: %s port at %llx, irq %u\n",
to_of_device(up->port.dev)->node->full_name, to_of_device(up->port.dev)->node->full_name,
(up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse", (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
up->port.mapbase, up->port.irq); (unsigned long long) up->port.mapbase,
up->port.irq);
#ifdef CONFIG_SERIO #ifdef CONFIG_SERIO
serio = &up->serio; serio = &up->serio;
......
...@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m ...@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
return err; return err;
} }
} else { } else {
printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) " printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
"is a %s\n", "is a %s\n",
op->dev.bus_id, up[0].port.mapbase, op->irqs[0], op->dev.bus_id,
sunzilog_type (&up[0].port)); (unsigned long long) up[0].port.mapbase,
printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) " op->irqs[0], sunzilog_type(&up[0].port));
printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
"is a %s\n", "is a %s\n",
op->dev.bus_id, up[1].port.mapbase, op->irqs[0], op->dev.bus_id,
sunzilog_type (&up[1].port)); (unsigned long long) up[1].port.mapbase,
op->irqs[0], sunzilog_type(&up[1].port));
} }
dev_set_drvdata(&op->dev, &up[0]); dev_set_drvdata(&op->dev, &up[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment