Merge branch 'spi-4.18' into spi-linus

diff --combined drivers/spi/spi-davinci.c
index 577084b,4ffc0f4..a02099c
--- 1/drivers/spi/spi-davinci.c
--- 2/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -217,7 -217,7 +217,7 @@@ static void davinci_spi_chipselect(stru
        pdata = &dspi->pdata;
  
        /* program delay transfers if tx_delay is non zero */
-       if (spicfg->wdelay)
+       if (spicfg && spicfg->wdelay)
                spidat1 |= SPIDAT1_WDEL;
  
        /*
@@@ -923,10 -923,9 +923,10 @@@ static int davinci_spi_probe(struct pla
        /* pdata in dspi is now updated and point pdata to that */
        pdata = &dspi->pdata;
  
 -      dspi->bytes_per_word = devm_kzalloc(&pdev->dev,
 -                                          sizeof(*dspi->bytes_per_word) *
 -                                          pdata->num_chipselect, GFP_KERNEL);
 +      dspi->bytes_per_word = devm_kcalloc(&pdev->dev,
 +                                          pdata->num_chipselect,
 +                                          sizeof(*dspi->bytes_per_word),
 +                                          GFP_KERNEL);
        if (dspi->bytes_per_word == NULL) {
                ret = -ENOMEM;
                goto free_master;