mailbox: Rename free() to rfree()

This function name conflicts with our desire to #define free() to
something else on sandbox. Since it deals with resources, rename it to
rfree().

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index b07b56cf97b9ebd539dc8a3a26af36e9bb6117c3..1194c6f029cade10da9e17322538dcdcd52fd655 100644 (file)
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -291,7 +291,7 @@ static int k3_sec_proxy_recv(struct mbox_chan *chan, void *data)
 struct mbox_ops k3_sec_proxy_mbox_ops = {
        .of_xlate = k3_sec_proxy_of_xlate,
        .request = k3_sec_proxy_request,
-       .free = k3_sec_proxy_free,
+       .rfree = k3_sec_proxy_free,
        .send = k3_sec_proxy_send,
        .recv = k3_sec_proxy_recv,
 };

diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 5968c9b7eb67505fbae7c2f03edeab989d084c98..a6d2d1f5b8330d109c358f2a1c8b0f1723f2b089 100644 (file)
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -105,8 +105,8 @@ int mbox_free(struct mbox_chan *chan)
 
        debug("%s(chan=%p)\n", __func__, chan);
 
-       if (ops->free)
-               return ops->free(chan);
+       if (ops->rfree)
+               return ops->rfree(chan);
 
        return 0;
 }

diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index bc917b3de49413b0228a6c280b29d18b1d75b36b..442ca633a19a10fa050e61966382d92da76e6a85 100644 (file)
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -87,7 +87,7 @@ static const struct udevice_id sandbox_mbox_ids[] = {
 
 struct mbox_ops sandbox_mbox_mbox_ops = {
        .request = sandbox_mbox_request,
-       .free = sandbox_mbox_free,
+       .rfree = sandbox_mbox_free,
        .send = sandbox_mbox_send,
        .recv = sandbox_mbox_recv,
 };

diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index c3df9678a7472fb516249712f7cf79ad5465a67b..d4035a85f2f2c013a3feb780ff92a1885dd9ea73 100644 (file)
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -152,7 +152,7 @@ static const struct udevice_id stm32_ipcc_ids[] = {
 
 struct mbox_ops stm32_ipcc_mbox_ops = {
        .request = stm32_ipcc_request,
-       .free = stm32_ipcc_free,
+       .rfree = stm32_ipcc_free,
        .send = stm32_ipcc_send,
        .recv = stm32_ipcc_recv,
 };

diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index 9bee886561c5296cdd8a226ef7d6e1478db0c9bd..c463e6a2be5c4e33ebeaedbaa0fe916d408165e4 100644 (file)
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -175,7 +175,7 @@ static const struct udevice_id tegra_hsp_ids[] = {
 struct mbox_ops tegra_hsp_mbox_ops = {
        .of_xlate = tegra_hsp_of_xlate,
        .request = tegra_hsp_request,
-       .free = tegra_hsp_free,
+       .rfree = tegra_hsp_free,
        .send = tegra_hsp_send,
        .recv = tegra_hsp_recv,
 };

diff --git a/include/mailbox-uclass.h b/include/mailbox-uclass.h
index e0618aad97b95165c6d6238af905833aa3a4b4ee..3c60c7650686f9ddea07665cbcd1f5c652909d1b 100644 (file)
--- a/include/mailbox-uclass.h
+++ b/include/mailbox-uclass.h
@@ -49,14 +49,14 @@ struct mbox_ops {
         */
        int (*request)(struct mbox_chan *chan);
        /**
-        * free - Free a previously requested channel.
+        * rfree - Free a previously requested channel.
         *
         * This is the implementation of the client mbox_free() API.
         *
         * @chan:       The channel to free.
         * @return 0 if OK, or a negative error code.
         */
-       int (*free)(struct mbox_chan *chan);
+       int (*rfree)(struct mbox_chan *chan);
        /**
        * send - Send a message over a mailbox channel
        *