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

diff --combined drivers/spi/spi-sh-hspi.c
index 7e749a22f51e8c6c22fae89742263e1afbc46424,b9e7b5e61528d2100e28628d9575e2af84a1530a..bc38aaf4e1f966e27b724b89844975e2726454b6
--- 1/drivers/spi/spi-sh-hspi.c
--- 2/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@@ -137,7 -137,7 +137,7 @@@ static void hspi_hw_setup(struct hspi_p
                        rate /= 16;
  
                /* CLKCx calculation */
-               rate /= (((idiv_clk & 0x1F) + 1) * 2) ;
+               rate /= (((idiv_clk & 0x1F) + 1) * 2);
  
                /* save best settings */
                tmp = abs(target_rate - rate);
@@@ -305,7 -305,7 +305,7 @@@ static int hspi_probe(struct platform_d
        master->mode_bits       = SPI_CPOL | SPI_CPHA;
        master->auto_runtime_pm = true;
        master->transfer_one_message            = hspi_transfer_one_message;
 -      ret = spi_register_master(master);
 +      ret = devm_spi_register_master(&pdev->dev, master);
        if (ret < 0) {
                dev_err(&pdev->dev, "spi_register_master error.\n");
                goto error1;
@@@ -328,6 -328,7 +328,6 @@@ static int hspi_remove(struct platform_
        pm_runtime_disable(&pdev->dev);
  
        clk_put(hspi->clk);
 -      spi_unregister_master(hspi->master);
  
        return 0;
  }