Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / remoteproc / stm32_rproc.c

diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 7353f9e..b643efc 100644 (file)
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -474,14 +474,12 @@ static int stm32_rproc_attach(struct rproc *rproc)
 static int stm32_rproc_detach(struct rproc *rproc)
 {
        struct stm32_rproc *ddata = rproc->priv;
-       int err, dummy_data, idx;
+       int err, idx;
 
        /* Inform the remote processor of the detach */
        idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_DETACH);
        if (idx >= 0 && ddata->mb[idx].chan) {
-               /* A dummy data is sent to allow to block on transmit */
-               err = mbox_send_message(ddata->mb[idx].chan,
-                                       &dummy_data);
+               err = mbox_send_message(ddata->mb[idx].chan, "stop");
                if (err < 0)
                        dev_warn(&rproc->dev, "warning: remote FW detach without ack\n");
        }
@@ -493,15 +491,13 @@ static int stm32_rproc_detach(struct rproc *rproc)
 static int stm32_rproc_stop(struct rproc *rproc)
 {
        struct stm32_rproc *ddata = rproc->priv;
-       int err, dummy_data, idx;
+       int err, idx;
 
        /* request shutdown of the remote processor */
        if (rproc->state != RPROC_OFFLINE) {
                idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN);
                if (idx >= 0 && ddata->mb[idx].chan) {
-                       /* a dummy data is sent to allow to block on transmit */
-                       err = mbox_send_message(ddata->mb[idx].chan,
-                                               &dummy_data);
+                       err = mbox_send_message(ddata->mb[idx].chan, "detach");
                        if (err < 0)
                                dev_warn(&rproc->dev, "warning: remote FW shutdown without ack\n");
                }
@@ -556,7 +552,7 @@ static void stm32_rproc_kick(struct rproc *rproc, int vqid)
                        continue;
                if (!ddata->mb[i].chan)
                        return;
-               err = mbox_send_message(ddata->mb[i].chan, (void *)(long)vqid);
+               err = mbox_send_message(ddata->mb[i].chan, "kick");
                if (err < 0)
                        dev_err(&rproc->dev, "%s: failed (%s, err:%d)\n",
                                __func__, ddata->mb[i].name, err);
@@ -580,7 +576,7 @@ static int stm32_rproc_da_to_pa(struct rproc *rproc,
                        continue;
 
                *pa = da - p_mem->dev_addr + p_mem->bus_addr;
-               dev_dbg(dev, "da %llx to pa %#x\n", da, *pa);
+               dev_dbg(dev, "da %llx to pa %pap\n", da, pa);
 
                return 0;
        }