Commit 44f2c7f3df for qemu.org
commit 44f2c7f3df0028de7991385f568add12e24aca47
Author: Peter Maydell <peter.maydell@linaro.org>
Date: Thu May 28 16:28:52 2026 +0100
hw/dma/omap_dma: Fix indentation after ifdef removal
Some of the ifdefs in omap_dma_transfer_setup() which we just
removed had if() blocks in them. Now that the code inside them
is always unconditional it has an extra unnecessary layer of
indentation; fix this, as a whitespace only change.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20260528152852.3349928-4-peter.maydell@linaro.org
diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index b8bbb707c4..668fc49054 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -470,91 +470,91 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma)
/* Set appropriate interrupts and/or deactivate channels */
- /* If the channel is element synchronized, deactivate it */
- if (min_elems == elements[omap_dma_intr_element_sync]) {
- omap_dma_deactivate_channel(s, ch);
- }
+ /* If the channel is element synchronized, deactivate it */
+ 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]) {
- ch->status |= LAST_FRAME_INTR;
- }
+ /* If it is the last frame, set the LAST_FRAME interrupt */
+ 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]) {
- ch->status |= HALF_FRAME_INTR;
- }
+ /*
+ * 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]) {
- ch->status |= END_PKT_INTR;
- }
+ /* If a full packet has been transferred, set the END_PKT interrupt */
+ 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]) {
- omap_dma_deactivate_channel(s, ch);
- }
+ /* If the channel is packet-synchronized, deactivate it */
+ 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]) {
+ omap_dma_deactivate_channel(s, ch);
+ }
- /* If the channel is frame synchronized, deactivate it */
- if (min_elems == elements[omap_dma_intr_frame_sync]) {
+ /* Set the END_FRAME interrupt */
+ 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) {
+ omap_dma_disable_channel(s, ch);
+ } else if (ch->repeat || ch->end_prog) {
+ omap_dma_channel_load(ch);
+ } else {
+ ch->waiting_end_prog = 1;
omap_dma_deactivate_channel(s, ch);
}
- /* Set the END_FRAME interrupt */
- if (min_elems == elements[omap_dma_intr_frame]) {
- ch->status |= END_FRAME_INTR;
+ if (ch->interrupts & END_BLOCK_INTR) {
+ ch->status |= END_BLOCK_INTR;
}
+ }
- if (min_elems == elements[omap_dma_intr_block]) {
- /* End of Block */
- /* Disable the channel */
-
- if (!ch->auto_init) {
- omap_dma_disable_channel(s, ch);
- } else if (ch->repeat || ch->end_prog) {
- omap_dma_channel_load(ch);
- } else {
- ch->waiting_end_prog = 1;
- omap_dma_deactivate_channel(s, ch);
- }
-
- if (ch->interrupts & END_BLOCK_INTR) {
- ch->status |= END_BLOCK_INTR;
- }
- }
+ /* Update packet number */
+ if (ch->fs && ch->bs) {
+ a->pck_element += min_elems;
+ a->pck_element %= a->pck_elements;
+ }
- /* Update packet number */
- if (ch->fs && ch->bs) {
- a->pck_element += min_elems;
- a->pck_element %= a->pck_elements;
+ /*
+ * 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;
+
+ frames = a->element / a->elements;
+ a->element = a->element % a->elements;
+ a->frame += frames;
+ a->src += min_elems * a->elem_delta[0] + frames * a->frame_delta[0];
+ a->dest += min_elems * a->elem_delta[1] + frames * a->frame_delta[1];
+
+ /* If the channel is async, update cpc */
+ if (!ch->sync && frames) {
+ ch->cpc = a->dest & 0xffff;
}
/*
- * TODO: check if we really need to update anything here or perhaps we
- * can skip part of this.
+ * TODO: if the destination port is IMIF or EMIFF, set the dirty
+ * bits on it.
*/
- if (dma->update) {
- a->element += min_elems;
-
- frames = a->element / a->elements;
- a->element = a->element % a->elements;
- a->frame += frames;
- a->src += min_elems * a->elem_delta[0] + frames * a->frame_delta[0];
- a->dest += min_elems * a->elem_delta[1] + frames * a->frame_delta[1];
-
- /* If the channel is async, update cpc */
- if (!ch->sync && frames) {
- ch->cpc = a->dest & 0xffff;
- }
-
- /*
- * TODO: if the destination port is IMIF or EMIFF, set the dirty
- * bits on it.
- */
- }
+ }
omap_dma_interrupts_update(s);
}