Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/topic/pl022' into spi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Oct 25, 2013
2 parents 3135ba8 + 2c06750 commit 7e0ae74
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/spi/spi-pl022.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 7e0ae74

Please sign in to comment.