Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1377703

[PATCH V3] mtd: nand: pasemi: switch to dev_* printing functions

Show all headers | View raw

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:
warning: format ‘%08llx’ expects type ‘long long unsigned int’, but argument 2 has type ‘resource_size_t’

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
V3: Switch to dev_* instead of pr_*
---
 drivers/mtd/nand/pasemi_nand.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 63fcb8c..5de7591 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -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;
 
-- 
1.8.4.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] mtd: nand: pasemi: switch to pr_* functions Rafał Miłecki <zajec5@gmail.com> - 2016-04-08 12:40 +0200
  Re: [PATCH] mtd: nand: pasemi: switch to pr_* functions Joe Perches <joe@perches.com> - 2016-04-08 13:00 +0200
  [PATCH V2] mtd: nand: pasemi: switch to pr_* functions Rafał Miłecki <zajec5@gmail.com> - 2016-04-08 13:20 +0200
    Re: [PATCH V2] mtd: nand: pasemi: switch to pr_* functions Joe Perches <joe@perches.com> - 2016-04-08 19:00 +0200
    Re: [PATCH V2] mtd: nand: pasemi: switch to pr_* functions Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-04-09 12:00 +0200
      Re: [PATCH V2] mtd: nand: pasemi: switch to pr_* functions Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-04-13 09:50 +0200
    [PATCH V3] mtd: nand: pasemi: switch to dev_* printing functions Rafał Miłecki <zajec5@gmail.com> - 2016-04-13 11:50 +0200
      Re: [PATCH V3] mtd: nand: pasemi: switch to dev_* printing  functions Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-04-13 14:00 +0200

csiph-web