On Wed, 7 Feb 2024 19:40:15 +0100
Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> wrote:
> In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
> some functions and struct members were renamed. To not break all drivers
> compatibility macros were provided.
>
> To be able to remove these compatibility macros push the renaming into
> this driver.
>
> Acked-by: Xu Yilun <yilun.xu@xxxxxxxxx>
> Acked-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Looks like b4 or similar got carried away. I've no objection to any of these
but the ack was only really meant to be for the IIO one.
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> drivers/fpga/ice40-spi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
> index 7cbb3558b844..c0028ae4c5b7 100644
> --- a/drivers/fpga/ice40-spi.c
> +++ b/drivers/fpga/ice40-spi.c
> @@ -66,7 +66,7 @@ static int ice40_fpga_ops_write_init(struct fpga_manager *mgr,
> }
>
> /* Lock the bus, assert CRESET_B and SS_B and delay >200ns */
> - spi_bus_lock(dev->master);
> + spi_bus_lock(dev->controller);
>
> gpiod_set_value(priv->reset, 1);
>
> @@ -94,7 +94,7 @@ static int ice40_fpga_ops_write_init(struct fpga_manager *mgr,
> ret = spi_sync_locked(dev, &message);
>
> fail:
> - spi_bus_unlock(dev->master);
> + spi_bus_unlock(dev->controller);
>
> return ret;
> }
