| Message ID | 20180301105641.1650792-2-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | b5d013bc09e9e76df9cdc85c2598486ba9a5b9b6 |
| Headers | show |
| Series | [1/2] misc: rtsx: rename SG_END macro | expand |
On Thu, Mar 1, 2018 at 12:31 PM, Arnd Bergmann <arnd@arndb.de> wrote: > 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. > Thanks, Arnd. This is right thing to do by my opinion. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings") > Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com> > Cc: Jens Axboe <axboe@kernel.dk> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ > drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- > 2 files changed, 11 insertions(+), 11 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; > > diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c > index 8b57e17ee6d3..716cce2bd7f0 100644 > --- a/drivers/staging/rts5208/rtsx_transport.c > +++ b/drivers/staging/rts5208/rtsx_transport.c > @@ -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 > -- With Best Regards, Andy Shevchenko
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; diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c index 8b57e17ee6d3..716cce2bd7f0 100644 --- a/drivers/staging/rts5208/rtsx_transport.c +++ b/drivers/staging/rts5208/rtsx_transport.c @@ -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);
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> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.9.0