From 22e26a3a13503f3c35ed8bbb6a7e9e33ad2c6987 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 16 May 2016 10:33:20 +0100 Subject: [PATCH] greybus: spi: rename rdwr field to xfer_flags As more bits will be added to the field, let's make the field more generic and name it accordingly. So, rename it from rdwr to xfer_flags. Signed-off-by: Rui Miguel Silva Reviewed-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/greybus_protocols.h | 2 +- drivers/staging/greybus/spilib.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h index d379fe36c7a5..0cddbb61e894 100644 --- a/drivers/staging/greybus/greybus_protocols.h +++ b/drivers/staging/greybus/greybus_protocols.h @@ -876,7 +876,7 @@ struct gb_spi_transfer { __le16 delay_usecs; __u8 cs_change; __u8 bits_per_word; - __u8 rdwr; + __u8 xfer_flags; #define GB_SPI_XFER_READ 0x01 #define GB_SPI_XFER_WRITE 0x02 } __packed; diff --git a/drivers/staging/greybus/spilib.c b/drivers/staging/greybus/spilib.c index 6ab1c5f77b7a..9eecbf391259 100644 --- a/drivers/staging/greybus/spilib.c +++ b/drivers/staging/greybus/spilib.c @@ -255,14 +255,14 @@ static struct gb_operation *gb_spi_operation_create(struct gb_spilib *spi, /* Copy tx data */ if (xfer->tx_buf) { - gb_xfer->rdwr |= GB_SPI_XFER_WRITE; + gb_xfer->xfer_flags |= GB_SPI_XFER_WRITE; memcpy(tx_data, xfer->tx_buf + spi->tx_xfer_offset, xfer_len); tx_data += xfer_len; } if (xfer->rx_buf) - gb_xfer->rdwr |= GB_SPI_XFER_READ; + gb_xfer->xfer_flags |= GB_SPI_XFER_READ; if (xfer == spi->last_xfer) { msg->state = GB_SPI_STATE_OP_DONE;