misc: rtsx: rename SG_END macro
Subsystems (2)
Arnd Bergmann
maintainerPATCH 1/2 misc: rtsx: 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/misc/cardreader/rtsx_pcr.c:32:include/linux/rtsx_pci.h:40: error: "SG_END" redefined [-Werror]
This changes one instance of the driver to prefix SG_END and related constants.
--- drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- include/linux/rtsx_pci.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +2 -2
@@ -444,12 +444,12 @@ static void rtsx_pci_add_sg_tbl(struct rtsx_pcr *pcr, {u64 *ptr = (u64 *)(pcr->host_sg_tbl_ptr) + pcr->sgi;u64 val; -u8 option =SG_VALID |SG_TRANS_DATA ; +u8 option =RTSX_SG_VALID |RTSX_SG_TRANS_DATA ;pcr_dbg (pcr,"DMA addr: 0x%x, Len: 0x%x\n" , (unsigned int )addr, len);if (end) - option |=SG_END ; + option |=RTSX_SG_END ; val = ((u64 )addr <<32 ) | ((u64 )len <<12 ) | option;put_unaligned_le64 (val, ptr);
include/linux/rtsx_pci.h +6 -6
@@ -36,12 +36,12 @@#define CHECK_REG_CMD 2#define RTSX_HDBAR 0x08 -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4)#define RTSX_HDBCTLR 0x0C#define SDMA_MODE 0x00#define ADMA_MODE (0x02 << 26)
Signature · 1 line
2.9.0
Arnd Bergmann
maintainerPATCH 2/2 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.
--- drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rts5208/rtsx_chip.h +6 -6
@@ -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 ;
drivers/staging/rts5208/rtsx_transport.c +5 -5
@@ -308,7 +308,7 @@ static inline void rtsx_add_sg_tbl( do { if (len > 0x80000) { temp_len = 0x80000; - temp_opt = option & (~SG_END); + temp_opt = option & (~RTSX_SG_END); } else { temp_len = len; temp_opt = option;
@@ -407,9 +407,9 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *index = *index +1 ; }if ((i == (sg_cnt -1 )) || !resid) - option =SG_VALID |SG_END |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_END |RTSX_SG_TRANS_DATA ;else - option =SG_VALID |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_TRANS_DATA ;rtsx_add_sg_tbl (chip, (u32 )addr, (u32 )len, option);
@@ -555,9 +555,9 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, (unsigned int)addr, len);if (j == (sg_cnt -1 )) - option =SG_VALID |SG_END |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_END |RTSX_SG_TRANS_DATA ;else - option =SG_VALID |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_TRANS_DATA ;rtsx_add_sg_tbl (chip, (u32 )addr, (u32 )len, option);
Signature · 6 lines
2.9.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2] staging: rts5208: rename SG_END macro
Quoted 10 lines · Arnd Bergmann
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_ENDand related constants.
Thanks, Arnd. This is right thing to do by my opinion.
Quoted 73 lines
Fixes 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings")Cc Anshuman Khandual <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)drivers/staging/rts5208/rtsx_chip.h +6
-6@@ -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 ;drivers/staging/rts5208/rtsx_transport.c +5
-6@@ -308,7 +308,7 @@ static inline void rtsx_add_sg_tbl( do { if (len > 0x80000) { temp_len = 0x80000; - temp_opt = option & (~SG_END); + temp_opt = option & (~RTSX_SG_END); } else { temp_len = len; temp_opt = option;@@ -407,9 +407,9 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *index = *index +1 ; }if ((i == (sg_cnt -1 )) || !resid) - option =SG_VALID |SG_END |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_END |RTSX_SG_TRANS_DATA ;else - option =SG_VALID |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_TRANS_DATA ;rtsx_add_sg_tbl (chip, (u32 )addr, (u32 )len, option);@@ -555,9 +555,9 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, (unsigned int)addr, len);if (j == (sg_cnt -1 )) - option =SG_VALID |SG_END |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_END |RTSX_SG_TRANS_DATA ;else - option =SG_VALID |SG_TRANS_DATA ; + option =RTSX_SG_VALID |RTSX_SG_TRANS_DATA ;rtsx_add_sg_tbl (chip, (u32 )addr, (u32 )len, option); --2.9.0
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 8 lines · Arnd Bergmann
A change to the generic scatterlist code caused a conflict with the rtsx card reader driver:
In file included from
drivers/misc/cardreader/rtsx_pcr.c:32:include/linux/rtsx_pci.h:40: error: "SG_END" redefined [-Werror]This changes one instance of the driver to prefix
SG_ENDand related constants.
Thanks Arnd, applied 1-2.
Signature · 1 line
Jens Axboe