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

Commit ff05fdb1 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Boris Brezillon
Browse files

mtd: nand: pasemi: switch to dev_* printing functions 



It also contains some minor related changes:
1) Don't warn if kzalloc fails as it dumps stack on its own
2) Use %pR format for displaying whole resource to avoid invalid format
   warning

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent ce111afd

drivers/mtd/nand/pasemi_nand.c

+7 −8
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ int pasemi_device_ready(struct mtd_info *mtd) 


static int pasemi_nand_probe(struct platform_device *ofdev)

{

	struct device *dev = &ofdev->dev;

	struct pci_dev *pdev;

	struct device_node *np = ofdev->dev.of_node;

	struct device_node *np = dev->of_node;

	struct resource res;

	struct nand_chip *chip;

	int err = 0;
@@ -107,13 +108,11 @@ static int pasemi_nand_probe(struct platform_device *ofdev) 
	if (pasemi_nand_mtd)

		return -ENODEV;



	pr_debug("pasemi_nand at %pR\n", &res);

	dev_dbg(dev, "pasemi_nand at %pR\n", &res);



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

	chip = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);

	if (!chip) {

		printk(KERN_WARNING

		       "Unable to allocate PASEMI NAND MTD device structure\n");

		err = -ENOMEM;

		goto out;

	}
@@ -121,7 +120,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev) 
	pasemi_nand_mtd = nand_to_mtd(chip);



	/* Link the private data with the MTD structure */

	pasemi_nand_mtd->dev.parent = &ofdev->dev;

	pasemi_nand_mtd->dev.parent = dev;



	chip->IO_ADDR_R = of_iomap(np, 0);

	chip->IO_ADDR_W = chip->IO_ADDR_R;
@@ -163,13 +162,13 @@ static int pasemi_nand_probe(struct platform_device *ofdev) 
	}



	if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {

		printk(KERN_ERR "pasemi_nand: Unable to register MTD device\n");

		dev_err(dev, "Unable to register MTD device\n");

		err = -ENODEV;

		goto out_lpc;

	}



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

	       res.start, lpcctl);

	dev_info(dev, "PA Semi NAND flash at %pR, control at I/O %x\n", &res,

		 lpcctl);



	return 0;