spi: get rid of some legacy macros

Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:

This series finishes off the removal of some of the legacy names for
SPI controllers and devices.

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

diff --cc include/linux/spi/spi.h
Simple merge