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;