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

Commit 4712fff9 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt
Browse files

powerpc: More printing warning fixes for the l64 to ll64 conversion 



These are all powerpc specific drivers.

res.start in fsl_elbc_nand.c needs to be cast since it may be either 32
or 64 bit.  Thanks to Scott Wood for noticing.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Arnd Bergmann <arnd@arndb.de> call_edac bits in particular
Acked-by: Olof Johansson <olof@lixom.net> pasemi_nand peices
Acked-by: Scott Wood <scottwood@freescale.com> fsl_elbc fixes
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 52c275fe

drivers/edac/cell_edac.c

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) 
	struct csrow_info		*csrow = &mci->csrows[0];

	unsigned long			address, pfn, offset, syndrome;



	dev_dbg(mci->dev, "ECC CE err on node %d, channel %d, ar = 0x%016lx\n",

	dev_dbg(mci->dev, "ECC CE err on node %d, channel %d, ar = 0x%016llx\n",

		priv->node, chan, ar);



	/* Address decoding is likely a bit bogus, to dbl check */
@@ -58,7 +58,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) 
	struct csrow_info		*csrow = &mci->csrows[0];

	unsigned long			address, pfn, offset;



	dev_dbg(mci->dev, "ECC UE err on node %d, channel %d, ar = 0x%016lx\n",

	dev_dbg(mci->dev, "ECC UE err on node %d, channel %d, ar = 0x%016llx\n",

		priv->node, chan, ar);



	/* Address decoding is likely a bit bogus, to dbl check */
@@ -169,7 +169,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 


	/* Get channel population */

	reg = in_be64(&regs->mic_mnt_cfg);

	dev_dbg(&pdev->dev, "MIC_MNT_CFG = 0x%016lx\n", reg);

	dev_dbg(&pdev->dev, "MIC_MNT_CFG = 0x%016llx\n", reg);

	chanmask = 0;

	if (reg & CBE_MIC_MNT_CFG_CHAN_0_POP)

		chanmask |= 0x1;
@@ -180,7 +180,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
			 "Yuck ! No channel populated ? Aborting !\n");

		return -ENODEV;

	}

	dev_dbg(&pdev->dev, "Initial FIR = 0x%016lx\n",

	dev_dbg(&pdev->dev, "Initial FIR = 0x%016llx\n",

		in_be64(&regs->mic_fir));



	/* Allocate & init EDAC MC data structure */

drivers/mtd/nand/fsl_elbc_nand.c

+4 −4
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd) 


	dev_dbg(ctrl->dev, "fsl_elbc_init: nand->numchips = %d\n",

	        chip->numchips);

	dev_dbg(ctrl->dev, "fsl_elbc_init: nand->chipsize = %ld\n",

	dev_dbg(ctrl->dev, "fsl_elbc_init: nand->chipsize = %lld\n",

	        chip->chipsize);

	dev_dbg(ctrl->dev, "fsl_elbc_init: nand->pagemask = %8x\n",

	        chip->pagemask);
@@ -703,7 +703,7 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd) 
	dev_dbg(ctrl->dev, "fsl_elbc_init: nand->ecc.layout = %p\n",

	        chip->ecc.layout);

	dev_dbg(ctrl->dev, "fsl_elbc_init: mtd->flags = %08x\n", mtd->flags);

	dev_dbg(ctrl->dev, "fsl_elbc_init: mtd->size = %d\n", mtd->size);

	dev_dbg(ctrl->dev, "fsl_elbc_init: mtd->size = %lld\n", mtd->size);

	dev_dbg(ctrl->dev, "fsl_elbc_init: mtd->erasesize = %d\n",

	        mtd->erasesize);

	dev_dbg(ctrl->dev, "fsl_elbc_init: mtd->writesize = %d\n",
@@ -932,8 +932,8 @@ static int __devinit fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, 
#endif

		add_mtd_device(&priv->mtd);



	printk(KERN_INFO "eLBC NAND device at 0x%zx, bank %d\n",

	       res.start, priv->bank);

	printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n",

	       (unsigned long long)res.start, priv->bank);

	return 0;



err:

drivers/mtd/nand/pasemi_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev, 
	if (pasemi_nand_mtd)

		return -ENODEV;



	pr_debug("pasemi_nand at %lx-%lx\n", res.start, res.end);

	pr_debug("pasemi_nand at %llx-%llx\n", res.start, res.end);



	/* Allocate memory for MTD device structure and private data */

	pasemi_nand_mtd = kzalloc(sizeof(struct mtd_info) +
@@ -170,7 +170,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev, 
		goto out_lpc;

	}



	printk(KERN_INFO "PA Semi NAND flash at %08lx, control at I/O %x\n",

	printk(KERN_INFO "PA Semi NAND flash at %08llx, control at I/O %x\n",

	       res.start, lpcctl);



	return 0;