We're about to fix indent in a section of the omap_dma_transfer_setup() function, which will make checkpatch complain. Since we're touching the code anyway, fix the uses of if() with no braces and wrongly formatted multiline comments.
Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] --- hw/dma/omap_dma.c | 51 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index a93d9ad196..b8bbb707c4 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -471,49 +471,59 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) /* If the channel is element synchronized, deactivate it */ - if (min_elems == elements[omap_dma_intr_element_sync]) + if (min_elems == elements[omap_dma_intr_element_sync]) { omap_dma_deactivate_channel(s, ch); + } /* If it is the last frame, set the LAST_FRAME interrupt */ - if (min_elems == elements[omap_dma_intr_last_frame]) + if (min_elems == elements[omap_dma_intr_last_frame]) { ch->status |= LAST_FRAME_INTR; + } - /* If exactly half of the frame was reached, set the HALF_FRAME - interrupt */ - if (min_elems == elements[omap_dma_intr_half_frame]) + /* + * If exactly half of the frame was reached, set the HALF_FRAME + * interrupt + */ + if (min_elems == elements[omap_dma_intr_half_frame]) { ch->status |= HALF_FRAME_INTR; + } /* If a full packet has been transferred, set the END_PKT interrupt */ - if (min_elems == elements[omap_dma_intr_packet]) + if (min_elems == elements[omap_dma_intr_packet]) { ch->status |= END_PKT_INTR; + } /* If the channel is packet-synchronized, deactivate it */ - if (min_elems == elements[omap_dma_intr_packet_sync]) + if (min_elems == elements[omap_dma_intr_packet_sync]) { omap_dma_deactivate_channel(s, ch); + } /* If the channel is frame synchronized, deactivate it */ - if (min_elems == elements[omap_dma_intr_frame_sync]) + if (min_elems == elements[omap_dma_intr_frame_sync]) { omap_dma_deactivate_channel(s, ch); + } /* Set the END_FRAME interrupt */ - if (min_elems == elements[omap_dma_intr_frame]) + if (min_elems == elements[omap_dma_intr_frame]) { ch->status |= END_FRAME_INTR; + } if (min_elems == elements[omap_dma_intr_block]) { /* End of Block */ /* Disable the channel */ - if (!ch->auto_init) + if (!ch->auto_init) { omap_dma_disable_channel(s, ch); - else if (ch->repeat || ch->end_prog) + } else if (ch->repeat || ch->end_prog) { omap_dma_channel_load(ch); - else { + } else { ch->waiting_end_prog = 1; omap_dma_deactivate_channel(s, ch); } - if (ch->interrupts & END_BLOCK_INTR) + if (ch->interrupts & END_BLOCK_INTR) { ch->status |= END_BLOCK_INTR; + } } /* Update packet number */ @@ -522,8 +532,10 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) a->pck_element %= a->pck_elements; } - /* TODO: check if we really need to update anything here or perhaps we - * can skip part of this. */ + /* + * TODO: check if we really need to update anything here or perhaps we + * can skip part of this. + */ if (dma->update) { a->element += min_elems; @@ -534,11 +546,14 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) a->dest += min_elems * a->elem_delta[1] + frames * a->frame_delta[1]; /* If the channel is async, update cpc */ - if (!ch->sync && frames) + if (!ch->sync && frames) { ch->cpc = a->dest & 0xffff; + } - /* TODO: if the destination port is IMIF or EMIFF, set the dirty - * bits on it. */ + /* + * TODO: if the destination port is IMIF or EMIFF, set the dirty + * bits on it. + */ } omap_dma_interrupts_update(s); -- 2.43.0
