Merge remote-tracking branch 'spi/topic/pl022' into spi-next

7e0ae740 · Mark Brown · 3135ba82 · 2c067509 · 7e0ae740
Commit 7e0ae740 authored Oct 25, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/spi/spi-pl022.c drivers/spi/spi-pl022.c +2 -2

No files found.
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2173,8 +2173,8 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
 		status = -ENOMEM;
 		goto err_no_ioremap;
 	}
-	printk(KERN_INFO "pl022: mapped registers from %pa to %p\n",
-	       &adev->res.start, pl022->virtbase);
+	dev_info(&adev->dev, "mapped registers from %pa to %p\n",
+		&adev->res.start, pl022->virtbase);

 	pl022->clk = devm_clk_get(&adev->dev, NULL);
 	if (IS_ERR(pl022->clk)) {