| Message ID | 20180920233024.28534-1-natechancellor@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: rawnand: Use proper enum for flctl_dma_fifo0_transfer | expand |
On Thu, Sep 20, 2018 at 4:31 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > Clang warns when one enumerated type is converted implicitly to another: > > drivers/mtd/nand/raw/sh_flctl.c:483:46: warning: implicit conversion > from enumeration type 'enum dma_transfer_direction' to different > enumeration type 'enum dma_data_direction' [-Wenum-conversion] > flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) > ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ > drivers/mtd/nand/raw/sh_flctl.c:542:46: warning: implicit conversion > from enumeration type 'enum dma_transfer_direction' to different > enumeration type 'enum dma_data_direction' [-Wenum-conversion] > flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) > ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ > 2 warnings generated. > > Use the proper enums from dma_data_direction to satisfy Clang. > > DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1 > DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2 > > Reported-by: Nick Desaulniers <ndesaulniers@google.com> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/mtd/nand/raw/sh_flctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c > index c0c0798f268f..4d20d033de7b 100644 > --- a/drivers/mtd/nand/raw/sh_flctl.c > +++ b/drivers/mtd/nand/raw/sh_flctl.c > @@ -480,7 +480,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset) > > /* initiate DMA transfer */ > if (flctl->chan_fifo0_rx && rlen >= 32 && > - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) > + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE) > 0) Looks like flctl_dma_fifo0_transfer() expects an `enum dma_data_direction dir`, not an `enum dma_transfer_direction` as noted by the warning, and luckily the values specified happened to have the same value today as you noted. So this change is no functional change, but will prevent changes to either enum from potentially breaking this code. Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > goto convert; /* DMA success */ > > /* do polling transfer */ > @@ -539,7 +539,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, > > /* initiate DMA transfer */ > if (flctl->chan_fifo0_tx && rlen >= 32 && > - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) > + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE) > 0) > return; /* DMA success */ > > /* do polling transfer */ > -- > 2.19.0 >
Hi Nathan, Nathan Chancellor <natechancellor@gmail.com> wrote on Thu, 20 Sep 2018 16:30:25 -0700: > Clang warns when one enumerated type is converted implicitly to another: > > drivers/mtd/nand/raw/sh_flctl.c:483:46: warning: implicit conversion > from enumeration type 'enum dma_transfer_direction' to different > enumeration type 'enum dma_data_direction' [-Wenum-conversion] > flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) > ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ > drivers/mtd/nand/raw/sh_flctl.c:542:46: warning: implicit conversion > from enumeration type 'enum dma_transfer_direction' to different > enumeration type 'enum dma_data_direction' [-Wenum-conversion] > flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) > ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ > 2 warnings generated. > > Use the proper enums from dma_data_direction to satisfy Clang. > > DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1 > DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2 > > Reported-by: Nick Desaulniers <ndesaulniers@google.com> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/mtd/nand/raw/sh_flctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c > index c0c0798f268f..4d20d033de7b 100644 > --- a/drivers/mtd/nand/raw/sh_flctl.c > +++ b/drivers/mtd/nand/raw/sh_flctl.c > @@ -480,7 +480,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset) > > /* initiate DMA transfer */ > if (flctl->chan_fifo0_rx && rlen >= 32 && > - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) > + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE) > 0) > goto convert; /* DMA success */ > > /* do polling transfer */ > @@ -539,7 +539,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, > > /* initiate DMA transfer */ > if (flctl->chan_fifo0_tx && rlen >= 32 && > - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) > + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE) > 0) > return; /* DMA success */ > > /* do polling transfer */ Applied on nand/next with the subject prefix changed to mtd: rawnand: sh_flctl: Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c index c0c0798f268f..4d20d033de7b 100644 --- a/drivers/mtd/nand/raw/sh_flctl.c +++ b/drivers/mtd/nand/raw/sh_flctl.c @@ -480,7 +480,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset) /* initiate DMA transfer */ if (flctl->chan_fifo0_rx && rlen >= 32 && - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE) > 0) goto convert; /* DMA success */ /* do polling transfer */ @@ -539,7 +539,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, /* initiate DMA transfer */ if (flctl->chan_fifo0_tx && rlen >= 32 && - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE) > 0) return; /* DMA success */ /* do polling transfer */
Clang warns when one enumerated type is converted implicitly to another: drivers/mtd/nand/raw/sh_flctl.c:483:46: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion] flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ drivers/mtd/nand/raw/sh_flctl.c:542:46: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion] flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ 2 warnings generated. Use the proper enums from dma_data_direction to satisfy Clang. DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1 DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2 Reported-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/mtd/nand/raw/sh_flctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)