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

diff --combined drivers/spi/spi-pl022.c
index 5e3011094eb618d390e0371427e9c232dfbccca6,6e77c938a6ae677c991c6448ba5d7e588e55f76f..2789b452e71159a86164ff752ef2c1e06a6da411
--- 1/drivers/spi/spi-pl022.c
--- 2/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -2173,8 -2173,8 +2173,8 @@@ static int pl022_probe(struct amba_devi
                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)) {
@@@ -2225,7 -2225,7 +2225,7 @@@
  
        /* Register with the SPI framework */
        amba_set_drvdata(adev, pl022);
 -      status = spi_register_master(master);
 +      status = devm_spi_register_master(&adev->dev, master);
        if (status != 0) {
                dev_err(&adev->dev,
                        "probe - problem registering spi master\n");
@@@ -2285,6 -2285,7 +2285,6 @@@ pl022_remove(struct amba_device *adev
        clk_unprepare(pl022->clk);
        amba_release_regions(adev);
        tasklet_disable(&pl022->pump_transfers);
 -      spi_unregister_master(pl022->master);
        return 0;
  }