diff options
| author | Arnd Bergmann | 2018-03-01 11:31:29 +0100 |
|---|---|---|
| committer | Jens Axboe | 2018-03-01 16:33:06 +0100 |
| commit | b5d013bc09e9e76df9cdc85c2598486ba9a5b9b6 (patch) | |
| tree | 10e69b4d7c5a4561e5bc12f852042ee90dffa3a0 /drivers/staging/rts5208/rtsx_chip.h | |
| parent | misc: rtsx: rename SG_END macro (diff) | |
| download | kernel-qcow2-linux-b5d013bc09e9e76df9cdc85c2598486ba9a5b9b6.tar.gz kernel-qcow2-linux-b5d013bc09e9e76df9cdc85c2598486ba9a5b9b6.tar.xz kernel-qcow2-linux-b5d013bc09e9e76df9cdc85c2598486ba9a5b9b6.zip | |
staging: rts5208: rename SG_END macro
A change to the generic scatterlist code caused a conflict with
the rtsx card reader driver:
In file included from drivers/staging/rts5208/rtsx.h:180,
from drivers/staging/rts5208/rtsx.c:28:
drivers/staging/rts5208/rtsx_chip.h:343: error: "SG_END" redefined [-Werror]
This changes one instance of the driver to prefix SG_END and
related constants.
Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings")
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/staging/rts5208/rtsx_chip.h')
| -rw-r--r-- | drivers/staging/rts5208/rtsx_chip.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rts5208/rtsx_chip.h b/drivers/staging/rts5208/rtsx_chip.h index 4f6e3c1c4621..8a8cd5d3cf7e 100644 --- a/drivers/staging/rts5208/rtsx_chip.h +++ b/drivers/staging/rts5208/rtsx_chip.h @@ -339,13 +339,13 @@ struct sense_data_t { #define CHK_BIT(data, idx) ((data) & (1 << (idx))) /* SG descriptor */ -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4) struct rtsx_chip; |