net: ks8851: Follow renaming of SPI "master" to "controller"

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.

Reviewed-by: Simon Horman <horms@kernel.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/4f26761c0c86072a084b2a20439da1d0a681b07b.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
index 54f2eac11a6316d9584b597a49b193191daaebd6..2f803377c9f9dd916153fbac269423006959e239 100644 (file)
--- a/drivers/net/ethernet/micrel/ks8851_spi.c
+++ b/drivers/net/ethernet/micrel/ks8851_spi.c
@@ -156,7 +156,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
 
        txb[0] = cpu_to_le16(op | KS_SPIOP_RD);
 
-       if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX) {
+       if (kss->spidev->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) {
                msg = &kss->spi_msg2;
                xfer = kss->spi_xfer2;
 
@@ -180,7 +180,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
        ret = spi_sync(kss->spidev, msg);
        if (ret < 0)
                netdev_err(ks->netdev, "read: spi_sync() failed\n");
-       else if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
+       else if (kss->spidev->controller->flags & SPI_CONTROLLER_HALF_DUPLEX)
                memcpy(rxb, trx, rxl);
        else
                memcpy(rxb, trx + 2, rxl);