Merge remote-tracking branch 'spi/topic/pl022' into spi-next
authorMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:35 +0000 (09:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:35 +0000 (09:51 +0100)
drivers/spi/spi-pl022.c

index 5e30110..2789b45 100644 (file)
@@ -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)) {