Merge tag 'socfpga_update_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / dma / iop-adma.c

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index a3f942a6a946ab7c40196f6152891b62302a5e3a..db0e274126fb7c4b6e779108732523b76fdde12f 100644 (file)
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -173,7 +173,7 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)
                                        &iop_chan->chain, chain_node) {
                                        zero_sum_result |=
                                            iop_desc_get_zero_result(grp_iter);
-                                           pr_debug("\titer%d result: %d\n",
+                                       pr_debug("\titer%d result: %d\n",
                                            grp_iter->idx, zero_sum_result);
                                        slot_cnt -= slots_per_op;
                                        if (slot_cnt == 0)
@@ -1359,9 +1359,11 @@ static int iop_adma_probe(struct platform_device *pdev)
        iop_adma_device_clear_err_status(iop_chan);
 
        for (i = 0; i < 3; i++) {
-               irq_handler_t handler[] = { iop_adma_eot_handler,
-                                       iop_adma_eoc_handler,
-                                       iop_adma_err_handler };
+               static const irq_handler_t handler[] = {
+                       iop_adma_eot_handler,
+                       iop_adma_eoc_handler,
+                       iop_adma_err_handler
+               };
                int irq = platform_get_irq(pdev, i);
                if (irq < 0) {
                        ret = -ENXIO;