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

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

[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

drivers/serial/sunsu.c

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

drivers/serial/sunzilog.c

+8 −6
Original line number Diff line number Diff line
@@ -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]);