| Message ID | 1389614690-25658-1-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1d566f11d02c |
| Delegated to: | Vinod Koul |
| Headers | show |
On Mon, Jan 13, 2014 at 02:04:48PM +0200, Andy Shevchenko wrote: > Simple fix a style of the multiline comment. > > There is no functional change. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Can you resend these, i am not able to apply these. Also the %pad patch needs to be merged after merge window. -- ~Vinod > --- > drivers/dma/dw/core.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c > index a0653dd..d3656b6 100644 > --- a/drivers/dma/dw/core.c > +++ b/drivers/dma/dw/core.c > @@ -218,8 +218,10 @@ static inline void dwc_do_single_block(struct dw_dma_chan *dwc, > struct dw_dma *dw = to_dw_dma(dwc->chan.device); > u32 ctllo; > > - /* Software emulation of LLP mode relies on interrupts to continue > - * multi block transfer. */ > + /* > + * Software emulation of LLP mode relies on interrupts to continue > + * multi block transfer. > + */ > ctllo = desc->lli.ctllo | DWC_CTLL_INT_EN; > > channel_writel(dwc, SAR, desc->lli.sar); > @@ -1604,9 +1606,11 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) > dev_dbg(chip->dev, "DWC_PARAMS[%d]: 0x%08x\n", i, > dwc_params); > > - /* Decode maximum block size for given channel. The > + /* > + * Decode maximum block size for given channel. The > * stored 4 bit value represents blocks from 0x00 for 3 > - * up to 0x0a for 4095. */ > + * up to 0x0a for 4095. > + */ > dwc->block_size = > (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1; > dwc->nollp = > -- > 1.8.5.2 >
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index a0653dd..d3656b6 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -218,8 +218,10 @@ static inline void dwc_do_single_block(struct dw_dma_chan *dwc, struct dw_dma *dw = to_dw_dma(dwc->chan.device); u32 ctllo; - /* Software emulation of LLP mode relies on interrupts to continue - * multi block transfer. */ + /* + * Software emulation of LLP mode relies on interrupts to continue + * multi block transfer. + */ ctllo = desc->lli.ctllo | DWC_CTLL_INT_EN; channel_writel(dwc, SAR, desc->lli.sar); @@ -1604,9 +1606,11 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) dev_dbg(chip->dev, "DWC_PARAMS[%d]: 0x%08x\n", i, dwc_params); - /* Decode maximum block size for given channel. The + /* + * Decode maximum block size for given channel. The * stored 4 bit value represents blocks from 0x00 for 3 - * up to 0x0a for 4095. */ + * up to 0x0a for 4095. + */ dwc->block_size = (4 << ((max_blk_size >> 4 * i) & 0xf)) - 1; dwc->nollp =
Simple fix a style of the multiline comment. There is no functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/dma/dw/core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)