Merge 3.16-rc4 into staging-next

[karo-tx-linux.git] / drivers / staging / tidspbridge / core / tiomap3430.c

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 8945b4e3a2a6fcccf7e57687d6425f44400252b8..f63dd8f4dde9c0504d18888fa59ed085bfd62d23 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -280,8 +280,10 @@ static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt)
                                        OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL);
 
                /* Wait until the state has moved to ON */
-               while (*pdata->dsp_prm_read(OMAP3430_IVA2_MOD, OMAP2_PM_PWSTST)&
-                                       OMAP_INTRANSITION_MASK);
+               while ((*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,
+                                             OMAP2_PM_PWSTST) &
+                                               OMAP_INTRANSITION_MASK)
+                       ;
                /* Disable Automatic transition */
                (*pdata->dsp_cm_write)(OMAP34XX_CLKSTCTRL_DISABLE_AUTO,
                                        OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL);
@@ -1057,6 +1059,7 @@ static int bridge_brd_mem_copy(struct bridge_dev_context *dev_ctxt,
        u32 total_bytes = ul_num_bytes;
        u8 host_buf[BUFFERSIZE];
        struct bridge_dev_context *dev_context = dev_ctxt;
+
        while (total_bytes > 0 && !status) {
                copy_bytes =
                    total_bytes > BUFFERSIZE ? BUFFERSIZE : total_bytes;
@@ -1094,6 +1097,7 @@ static int bridge_brd_mem_write(struct bridge_dev_context *dev_ctxt,
        struct bridge_dev_context *dev_context = dev_ctxt;
        u32 ul_remain_bytes = 0;
        u32 ul_bytes = 0;
+
        ul_remain_bytes = ul_num_bytes;
        while (ul_remain_bytes > 0 && !status) {
                ul_bytes =