| Message ID | 1368611522-9984-36-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 15, 2013 at 10:51:58AM +0100, Lee Jones wrote: > Unsure of the author's intentions, rather than just removing the nop, > we're replacing it with a comment containing the possible intention > of the statement OR:ing with 0. Would be worthwhile to check w/ Linus W on this (or check whom to blame) -- ~Vinod > > Cc: Vinod Koul <vinod.koul@intel.com> > Cc: Dan Williams <djbw@fb.com> > Cc: Per Forlin <per.forlin@stericsson.com> > Cc: Rabin Vincent <rabin@rab.in> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/dma/ste_dma40_ll.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c > index a035dfe..27b818d 100644 > --- a/drivers/dma/ste_dma40_ll.c > +++ b/drivers/dma/ste_dma40_ll.c > @@ -182,8 +182,10 @@ static int d40_phy_fill_lli(struct d40_phy_lli *lli, > else > lli->reg_cfg &= ~BIT(D40_SREG_CFG_TIM_POS); > > - /* Post link */ > - lli->reg_lnk |= 0 << D40_SREG_LNK_PHY_PRE_POS; > + /* > + * Post link - D40_SREG_LNK_PHY_PRE_POS = 0 > + * Relink happens after transfer completion. > + */ > > return 0; > } > -- > 1.7.10.4 >
> > Unsure of the author's intentions, rather than just removing the nop, > > we're replacing it with a comment containing the possible intention > > of the statement OR:ing with 0. > Would be worthwhile to check w/ Linus W on this (or check whom to blame) I did already. It was his idea to place the comment in. The original author will on parental leave for the foreseeable future.
On Wed, May 15, 2013 at 11:51 AM, Lee Jones <lee.jones@linaro.org> wrote: > Unsure of the author's intentions, rather than just removing the nop, > we're replacing it with a comment containing the possible intention > of the statement OR:ing with 0. > > Cc: Vinod Koul <vinod.koul@intel.com> > Cc: Dan Williams <djbw@fb.com> > Cc: Per Forlin <per.forlin@stericsson.com> > Cc: Rabin Vincent <rabin@rab.in> > Signed-off-by: Lee Jones <lee.jones@linaro.org> Tentatively applied. Missing Vinod's ACK. Yours, Linus Walleij
On Thu, May 30, 2013 at 11:04:23AM +0200, Linus Walleij wrote: > On Wed, May 15, 2013 at 11:51 AM, Lee Jones <lee.jones@linaro.org> wrote: > > > Unsure of the author's intentions, rather than just removing the nop, > > we're replacing it with a comment containing the possible intention > > of the statement OR:ing with 0. > > > > Cc: Vinod Koul <vinod.koul@intel.com> > > Cc: Dan Williams <djbw@fb.com> > > Cc: Per Forlin <per.forlin@stericsson.com> > > Cc: Rabin Vincent <rabin@rab.in> > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Tentatively applied. Missing Vinod's ACK. Acked-by: Vinod Koul <vinod.koul@intel.com> -- ~Vinod
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c index a035dfe..27b818d 100644 --- a/drivers/dma/ste_dma40_ll.c +++ b/drivers/dma/ste_dma40_ll.c @@ -182,8 +182,10 @@ static int d40_phy_fill_lli(struct d40_phy_lli *lli, else lli->reg_cfg &= ~BIT(D40_SREG_CFG_TIM_POS); - /* Post link */ - lli->reg_lnk |= 0 << D40_SREG_LNK_PHY_PRE_POS; + /* + * Post link - D40_SREG_LNK_PHY_PRE_POS = 0 + * Relink happens after transfer completion. + */ return 0; }
Unsure of the author's intentions, rather than just removing the nop, we're replacing it with a comment containing the possible intention of the statement OR:ing with 0. Cc: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <djbw@fb.com> Cc: Per Forlin <per.forlin@stericsson.com> Cc: Rabin Vincent <rabin@rab.in> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/dma/ste_dma40_ll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)