spi: Merge up fix

One small fix that didn't seem worth sending before the merge window.

diff --cc drivers/spi/spi-npcm-fiu.c
Simple merge

diff --cc drivers/spi/spi-nxp-fspi.c
Simple merge

diff --cc drivers/spi/spi-stm32.c
Simple merge