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

diff --cc drivers/spi/spi-clps711x.c
index 7f2fd33,73b9a46..e2a5a42
--- 1/drivers/spi/spi-clps711x.c
--- 2/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@@ -226,10 -226,10 +226,10 @@@ static int spi_clps711x_probe(struct pl
                               dev_name(&pdev->dev), hw);
        if (ret) {
                dev_err(&pdev->dev, "Can't request IRQ\n");
-               goto clk_out;
+               goto err_out;
        }
  
 -      ret = spi_register_master(master);
 +      ret = devm_spi_register_master(&pdev->dev, master);
        if (!ret) {
                dev_info(&pdev->dev,
                         "SPI bus driver initialized. Master clock %u Hz\n",