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

Commit a1080968 authored by Grant Likely's avatar Grant Likely
Browse files

powerpc/virtex: fix various format/casting printk mismatches 



Various printk format string in code used by the Xilinx Virtex platform
are not 32-bit/64-bit safe.  Add correct casting to fix the bugs.

Reported-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 847cdf42

arch/powerpc/sysdev/xilinx_intc.c

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ xilinx_intc_init(struct device_node *np) 
	}

	regs = ioremap(res.start, 32);



	printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n",

		res.start, regs);

	printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n",

		(unsigned long long) res.start, regs);



	/* Setup interrupt controller */

	out_be32(regs + XINTC_IER, 0); /* disable all irqs */

drivers/block/xsysace.c

+2 −2
Original line number Diff line number Diff line
@@ -628,8 +628,8 @@ static void ace_fsm_dostate(struct ace_device *ace) 


		/* Okay, it's a data request, set it up for transfer */

		dev_dbg(ace->dev,

			"request: sec=%lx hcnt=%lx, ccnt=%x, dir=%i\n",

			req->sector, req->hard_nr_sectors,

			"request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n",

			(unsigned long long) req->sector, req->hard_nr_sectors,

			req->current_nr_sectors, rq_data_dir(req));



		ace->req = req;

drivers/char/xilinx_hwicap/xilinx_hwicap.c

+5 −4
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static int __devinit hwicap_setup(struct device *dev, int id, 
	if (!request_mem_region(drvdata->mem_start,

					drvdata->mem_size, DRIVER_NAME)) {

		dev_err(dev, "Couldn't lock memory region at %Lx\n",

			regs_res->start);

			(unsigned long long) regs_res->start);

		retval = -EBUSY;

		goto failed1;

	}
@@ -645,9 +645,10 @@ static int __devinit hwicap_setup(struct device *dev, int id, 
	mutex_init(&drvdata->sem);

	drvdata->is_open = 0;



	dev_info(dev, "ioremap %lx to %p with size %Lx\n",

		 (unsigned long int)drvdata->mem_start,

			drvdata->base_address, drvdata->mem_size);

	dev_info(dev, "ioremap %llx to %p with size %llx\n",

		 (unsigned long long) drvdata->mem_start,

		 drvdata->base_address,

		 (unsigned long long) drvdata->mem_size);



	cdev_init(&drvdata->cdev, &hwicap_fops);

	drvdata->cdev.owner = THIS_MODULE;

drivers/serial/uartlite.c

+2 −2
Original line number Diff line number Diff line
@@ -286,8 +286,8 @@ static void ulite_release_port(struct uart_port *port) 


static int ulite_request_port(struct uart_port *port)

{

	pr_debug("ulite console: port=%p; port->mapbase=%x\n",

		 port, port->mapbase);

	pr_debug("ulite console: port=%p; port->mapbase=%llx\n",

		 port, (unsigned long long) port->mapbase);



	if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {

		dev_err(port->dev, "Memory region busy\n");

drivers/video/xilinxfb.c

+3 −2
Original line number Diff line number Diff line
@@ -298,8 +298,9 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr, 


	/* Put a banner in the log (for DEBUG) */

	dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs);

	dev_dbg(dev, "fb: phys=%p, virt=%p, size=%x\n",

		(void*)drvdata->fb_phys, drvdata->fb_virt, fbsize);

	dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",

		(unsigned long long) drvdata->fb_phys, drvdata->fb_virt,

		fbsize);



	return 0;	/* success */