summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 08:51:35 (GMT)
committerMark Brown <broonie@linaro.org>2013-10-25 08:51:35 (GMT)
commit7e0ae74090a46663b0a650e9e70aea74cc737cf2 (patch)
tree1d11eae0f498e9a9e9a5760c1dcbf0edbc54a8cc /drivers
parent3135ba82a14f19a544e9050e8af27f54e08b8190 (diff)
parent2c067509a1e3540613ef597c5dc6bd1f47d539cb (diff)
downloadlinux-7e0ae74090a46663b0a650e9e70aea74cc737cf2.tar.xz
Merge remote-tracking branch 'spi/topic/pl022' into spi-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-pl022.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 5e30110..2789b45 100644
--- 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)) {