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

diff --combined drivers/spi/spi-txx9.c
index 1937be437246dae0c6578d022bfff497796d8089,017139bdec999ce37d512c503d55453b48ca54c8..637cce2b8bdde8d3f37c8134a5f3aee7c4adead8
--- 1/drivers/spi/spi-txx9.c
--- 2/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@@ -177,7 -177,7 +177,7 @@@ static void txx9spi_work_one(struct txx
                        | 0x08,
                        TXx9_SPCR0);
  
-       list_for_each_entry (t, &m->transfers, transfer_list) {
+       list_for_each_entry(t, &m->transfers, transfer_list) {
                const void *txbuf = t->tx_buf;
                void *rxbuf = t->rx_buf;
                u32 data;
@@@ -308,7 -308,7 +308,7 @@@ static int txx9spi_transfer(struct spi_
        m->actual_length = 0;
  
        /* check each transfer's parameters */
-       list_for_each_entry (t, &m->transfers, transfer_list) {
+       list_for_each_entry(t, &m->transfers, transfer_list) {
                u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
                u8 bits_per_word = t->bits_per_word;
  
@@@ -406,7 -406,7 +406,7 @@@ static int txx9spi_probe(struct platfor
        master->num_chipselect = (u16)UINT_MAX; /* any GPIO numbers */
        master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);
  
 -      ret = spi_register_master(master);
 +      ret = devm_spi_register_master(&dev->dev, master);
        if (ret)
                goto exit;
        return 0;
@@@ -428,9 -428,11 +428,9 @@@ static int txx9spi_remove(struct platfo
        struct spi_master *master = spi_master_get(platform_get_drvdata(dev));
        struct txx9spi *c = spi_master_get_devdata(master);
  
 -      spi_unregister_master(master);
        destroy_workqueue(c->workqueue);
        clk_disable(c->clk);
        clk_put(c->clk);
 -      spi_master_put(master);
        return 0;
  }
  
@@@ -438,7 -440,6 +438,7 @@@
  MODULE_ALIAS("platform:spi_txx9");
  
  static struct platform_driver txx9spi_driver = {
 +      .probe = txx9spi_probe,
        .remove = txx9spi_remove,
        .driver = {
                .name = "spi_txx9",
@@@ -448,7 -449,7 +448,7 @@@
  
  static int __init txx9spi_init(void)
  {
 -      return platform_driver_probe(&txx9spi_driver, txx9spi_probe);
 +      return platform_driver_register(&txx9spi_driver);
  }
  subsys_initcall(txx9spi_init);