Skip to content

Commit

Permalink
[SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Aug 27, 2007
1 parent 7bcd4da commit 4f1296a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
5 changes: 3 additions & 2 deletions drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
if (up->port.type == PORT_UNKNOWN)
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,
(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
serio = &up->serio;
Expand Down
14 changes: 8 additions & 6 deletions drivers/serial/sunzilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
return err;
}
} 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",
op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
sunzilog_type (&up[0].port));
printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
op->dev.bus_id,
(unsigned long long) up[0].port.mapbase,
op->irqs[0], sunzilog_type(&up[0].port));
printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
"is a %s\n",
op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
sunzilog_type (&up[1].port));
op->dev.bus_id,
(unsigned long long) up[1].port.mapbase,
op->irqs[0], sunzilog_type(&up[1].port));
}

dev_set_drvdata(&op->dev, &up[0]);
Expand Down

0 comments on commit 4f1296a

Please sign in to comment.