This patchset is trying to replace spi_alloc_master() with __devm_spi_alloc_controller() in some spi drivers. With this helper, spi_master_put() is called in devres_release_all() whenever the device is unbound, so the spi_master_put() in error path can be removed. v2: Using controller named struct and functions: Using struct spi_controller instead of struct spi_master Using __devm_spi_alloc_controller() instead of devm_spi_alloc_master() Using spi_controller_get_devdata() instead of spi_master_get_devdata() Using devm_spi_register_master() instead of devm_spi_register_controller() Yang Yingliang (6): spi: oc-tiny: Switch to use __devm_spi_alloc_controller() spi: ath79: Switch to use __devm_spi_alloc_controller() spi: omap-uwire: Switch to use __devm_spi_alloc_controller() spi: ppc4xx: Switch to use __devm_spi_alloc_controller() spi: sh-sci: Switch to use __devm_spi_alloc_controller() spi: altera: Switch to use __devm_spi_alloc_controller() drivers/spi/spi-altera-platform.c | 55 ++++++++++++++----------------- drivers/spi/spi-ath79.c | 40 ++++++++++------------ drivers/spi/spi-oc-tiny.c | 34 ++++++++----------- drivers/spi/spi-omap-uwire.c | 28 ++++++++-------- drivers/spi/spi-ppc4xx.c | 29 +++++++--------- drivers/spi/spi-sh-sci.c | 44 ++++++++++--------------- 6 files changed, 98 insertions(+), 132 deletions(-) -- 2.25.1