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

diff --combined drivers/spi/spi-orion.c
index d96d67869d7bd39e697eb61495227fc6421eb6e2,c6caed3c462556b7dc80f6313af837c75a1b2ab3..744841e095e4be7d4a8b7e6f057b2bed2915cf9a
--- 1/drivers/spi/spi-orion.c
--- 2/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@@ -84,8 -84,8 +84,8 @@@ static int orion_spi_set_transfer_size(
                orion_spi_clrbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
                                  ORION_SPI_IF_8_16_BIT_MODE);
        } else {
-               pr_debug("Bad bits per word value %d (only 8 or 16 are "
-                        "allowed).\n", size);
+               pr_debug("Bad bits per word value %d (only 8 or 16 are allowed).\n",
+                       size);
                return -EINVAL;
        }
  
@@@ -407,7 -407,7 +407,7 @@@ static int orion_spi_probe(struct platf
        const u32 *iprop;
        int size;
  
-       master = spi_alloc_master(&pdev->dev, sizeof *spi);
+       master = spi_alloc_master(&pdev->dev, sizeof(*spi));
        if (master == NULL) {
                dev_dbg(&pdev->dev, "master allocation failed\n");
                return -ENOMEM;
@@@ -457,7 -457,7 +457,7 @@@
                goto out_rel_clk;
  
        master->dev.of_node = pdev->dev.of_node;
 -      status = spi_register_master(master);
 +      status = devm_spi_register_master(&pdev->dev, master);
        if (status < 0)
                goto out_rel_clk;
  
@@@ -483,6 -483,8 +483,6 @@@ static int orion_spi_remove(struct plat
        clk_disable_unprepare(spi->clk);
        clk_put(spi->clk);
  
 -      spi_unregister_master(master);
 -
        return 0;
  }