spi: controller registration fixes

Johan Hovold <johan@kernel.org> says:

This series fixes a few issues related to controller registration found
through inspection.

diff --cc drivers/spi/spi-amlogic-spisg.c
Simple merge

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

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

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