Hi Guennadi, On 25 January 2012 11:26, Guennadi Liakhovetski <g.liakhovet...@gmx.de> wrote: > As discussed before, please, merge this patch with > > "media i.MX27 camera: properly detect frame loss."
Yes. You can drop that patch already. > One more cosmetic note: > > On Fri, 20 Jan 2012, Javier Martin wrote: > >> Add "start_stream" and "stop_stream" callback in order to enable >> and disable the eMMa-PrP properly and save CPU usage avoiding >> IRQs when the device is not streaming. >> >> Signed-off-by: Javier Martin <javier.mar...@vista-silicon.com> >> --- >> drivers/media/video/mx2_camera.c | 107 >> +++++++++++++++++++++++++++----------- >> 1 files changed, 77 insertions(+), 30 deletions(-) >> >> diff --git a/drivers/media/video/mx2_camera.c >> b/drivers/media/video/mx2_camera.c >> index 290ac9d..4816da6 100644 >> --- a/drivers/media/video/mx2_camera.c >> +++ b/drivers/media/video/mx2_camera.c >> @@ -560,7 +560,6 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) >> struct soc_camera_host *ici = >> to_soc_camera_host(icd->parent); >> struct mx2_camera_dev *pcdev = ici->priv; >> - struct mx2_fmt_cfg *prp = pcdev->emma_prp; >> struct mx2_buffer *buf = container_of(vb, struct mx2_buffer, vb); >> unsigned long flags; >> >> @@ -572,29 +571,7 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) >> buf->state = MX2_STATE_QUEUED; >> list_add_tail(&buf->queue, &pcdev->capture); >> >> - if (mx27_camera_emma(pcdev)) { >> - if (prp->cfg.channel == 1) { >> - writel(PRP_CNTL_CH1EN | >> - PRP_CNTL_CSIEN | >> - prp->cfg.in_fmt | >> - prp->cfg.out_fmt | >> - PRP_CNTL_CH1_LEN | >> - PRP_CNTL_CH1BYP | >> - PRP_CNTL_CH1_TSKIP(0) | >> - PRP_CNTL_IN_TSKIP(0), >> - pcdev->base_emma + PRP_CNTL); >> - } else { >> - writel(PRP_CNTL_CH2EN | >> - PRP_CNTL_CSIEN | >> - prp->cfg.in_fmt | >> - prp->cfg.out_fmt | >> - PRP_CNTL_CH2_LEN | >> - PRP_CNTL_CH2_TSKIP(0) | >> - PRP_CNTL_IN_TSKIP(0), >> - pcdev->base_emma + PRP_CNTL); >> - } >> - goto out; >> - } else { /* cpu_is_mx25() */ >> + if (!mx27_camera_emma(pcdev)) { /* cpu_is_mx25() */ >> u32 csicr3, dma_inten = 0; >> >> if (pcdev->fb1_active == NULL) { >> @@ -629,8 +606,6 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) >> writel(csicr3, pcdev->base_csi + CSICR3); >> } >> } >> - >> -out: > > To my taste you're a bit too aggressive on blank lines;-) This also holds > for the previous patch. Unless you absolutely have to edit your sources in > a 24-line terminal, keeping those empty lines would be appreciated:-) OK. I'll try to overcome my anger ^^ Regards. -- Javier Martin Vista Silicon S.L. CDTUC - FASE C - Oficina S-345 Avda de los Castros s/n 39005- Santander. Cantabria. Spain +34 942 25 32 60 www.vista-silicon.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html