Messages in this thread | | | Date | Fri, 25 Apr 2014 16:13:17 -0700 | From | Greg Kroah-Hartman <> | Subject | Re: [PATCH] staging/imx-drm: fix code line width |
| |
On Sat, Apr 12, 2014 at 02:04:21PM +0400, Brilliantov Kirill Vladimirovich wrote: > Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov@inbox.ru> > --- > drivers/staging/imx-drm/imx-tve.c | 3 ++- > drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 3 ++- > drivers/staging/imx-drm/ipu-v3/ipu-common.c | 23 +++++++++++++++-------- > drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 27 ++++++++++++++++++--------- > drivers/staging/imx-drm/ipu-v3/ipu-di.c | 12 ++++++++---- > drivers/staging/imx-drm/ipuv3-crtc.c | 6 ++++-- > 6 files changed, 49 insertions(+), 25 deletions(-) > > diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c > index 575533f..7023035 100644 > --- a/drivers/staging/imx-drm/imx-tve.c > +++ b/drivers/staging/imx-drm/imx-tve.c > @@ -669,7 +669,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) > > ret = regmap_read(tve->regmap, TVE_COM_CONF_REG, &val); > if (ret < 0) { > - dev_err(dev, "failed to read configuration register: %d\n", ret); > + dev_err(dev, > + "failed to read configuration register: %d\n", ret);
Why not just move the ret variable to the next line?
> return ret; > } > if (val != 0x00100000) { > diff --git a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h > index c4d14ea..4fd7be7 100644 > --- a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h > +++ b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h > @@ -230,7 +230,8 @@ struct ipu_ch_param { > struct ipu_cpmem_word word[2]; > }; > > -void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v); > +void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, > + u32 v); > u32 ipu_ch_param_read_field(struct ipu_ch_param __iomem *base, u32 wbs); > struct ipu_ch_param __iomem *ipu_get_cpmem(struct ipuv3_channel *channel); > void ipu_ch_param_dump(struct ipu_ch_param __iomem *p); > diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > index ca85d3d..b2c672f 100644 > --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c > +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > @@ -233,14 +233,20 @@ void ipu_cpmem_set_yuv_interleaved(struct ipu_ch_param __iomem *p, > { > switch (pixel_format) { > case V4L2_PIX_FMT_UYVY: > - ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3); /* bits/pixel */ > - ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0xA); /* pix format */ > - ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31); /* burst size */ > + /* bits/pixel */ > + ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3); > + /* pix format */ > + ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0xA); > + /* burst size */ > + ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31); > break; > case V4L2_PIX_FMT_YUYV: > - ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3); /* bits/pixel */ > - ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0x8); /* pix format */ > - ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31); /* burst size */ > + /* bits/pixel */ > + ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3); > + /* pix format */ > + ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0x8); > + /* burst size */ > + ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31); > break; > } > } > @@ -900,7 +906,8 @@ static void ipu_irq_handle(struct ipu_soc *ipu, const int *regs, int num_regs) > status &= ipu_cm_read(ipu, IPU_INT_CTRL(regs[i])); > > for_each_set_bit(bit, &status, 32) { > - irq = irq_linear_revmap(ipu->domain, regs[i] * 32 + bit); > + irq = > + irq_linear_revmap(ipu->domain, regs[i] * 32 + bit);
Does that really look better?
> if (irq) > generic_handle_irq(irq); > } > @@ -1053,7 +1060,7 @@ static int ipu_irq_init(struct ipu_soc *ipu) > } > > ret = irq_alloc_domain_generic_chips(ipu->domain, 32, 1, "IPU", > - handle_level_irq, 0, IRQF_VALID, 0); > + handle_level_irq, 0, IRQF_VALID, 0); > if (ret < 0) { > dev_err(ipu->dev, "failed to alloc generic irq chips\n"); > irq_domain_remove(ipu->domain); > diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c > index d5de8bb..b05111a 100644 > --- a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c > +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c > @@ -132,10 +132,12 @@ static void dc_write_tmpl(struct ipu_dc *dc, int word, u32 opcode, u32 operand, > reg1 = (operand << 20) & 0xfff00000; > reg2 = operand >> 12 | opcode << 1 | stop << 9; > } else if (opcode == WRG) { > - reg1 = sync | glue << 4 | ++wave << 11 | ((operand << 15) & 0xffff8000); > + reg1 = sync | glue << 4 | ++wave << 11 | > + ((operand << 15) & 0xffff8000); > reg2 = operand >> 17 | opcode << 7 | stop << 9; > } else { > - reg1 = sync | glue << 4 | ++wave << 11 | ++map << 15 | ((operand << 20) & 0xfff00000); > + reg1 = sync | glue << 4 | ++wave << 11 | ++map << 15 | > + ((operand << 20) & 0xfff00000); > reg2 = operand >> 12 | opcode << 4 | stop << 9; > } > writel(reg1, priv->dc_tmpl_reg + word * 8); > @@ -188,19 +190,25 @@ int ipu_dc_init_sync(struct ipu_dc *dc, struct ipu_di *di, bool interlaced, > dc_link_event(dc, DC_EVT_EOL, 3, 2); > dc_link_event(dc, DC_EVT_NEW_DATA, 1, 1); > /* Init template microcode */ > - dc_write_tmpl(dc, 2, WROD(0), 0, map, SYNC_WAVE, 8, 5, 1); > - dc_write_tmpl(dc, 3, WROD(0), 0, map, SYNC_WAVE, 4, 5, 0); > + dc_write_tmpl(dc, 2, WROD(0), 0, map, SYNC_WAVE, 8, > + 5, 1); > + dc_write_tmpl(dc, 3, WROD(0), 0, map, SYNC_WAVE, 4, > + 5, 0); > dc_write_tmpl(dc, 4, WRG, 0, map, NULL_WAVE, 0, 0, 1); > - dc_write_tmpl(dc, 1, WROD(0), 0, map, SYNC_WAVE, 0, 5, 1); > + dc_write_tmpl(dc, 1, WROD(0), 0, map, SYNC_WAVE, 0, > + 5, 1);
Just leave these alone, if it doesn't look better, it's not worth changing.
thanks,
greg k-h
| |