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>
This commit is contained in:
Simon Glass 2020-02-03 07:35:50 -07:00
parent 3b85ce8ec3
commit cc92c3cc68
6 changed files with 8 additions and 8 deletions

View File

@ -291,7 +291,7 @@ static int k3_sec_proxy_recv(struct mbox_chan *chan, void *data)
struct mbox_ops k3_sec_proxy_mbox_ops = { struct mbox_ops k3_sec_proxy_mbox_ops = {
.of_xlate = k3_sec_proxy_of_xlate, .of_xlate = k3_sec_proxy_of_xlate,
.request = k3_sec_proxy_request, .request = k3_sec_proxy_request,
.free = k3_sec_proxy_free, .rfree = k3_sec_proxy_free,
.send = k3_sec_proxy_send, .send = k3_sec_proxy_send,
.recv = k3_sec_proxy_recv, .recv = k3_sec_proxy_recv,
}; };

View File

@ -105,8 +105,8 @@ int mbox_free(struct mbox_chan *chan)
debug("%s(chan=%p)\n", __func__, chan); debug("%s(chan=%p)\n", __func__, chan);
if (ops->free) if (ops->rfree)
return ops->free(chan); return ops->rfree(chan);
return 0; return 0;
} }

View File

@ -87,7 +87,7 @@ static const struct udevice_id sandbox_mbox_ids[] = {
struct mbox_ops sandbox_mbox_mbox_ops = { struct mbox_ops sandbox_mbox_mbox_ops = {
.request = sandbox_mbox_request, .request = sandbox_mbox_request,
.free = sandbox_mbox_free, .rfree = sandbox_mbox_free,
.send = sandbox_mbox_send, .send = sandbox_mbox_send,
.recv = sandbox_mbox_recv, .recv = sandbox_mbox_recv,
}; };

View File

@ -152,7 +152,7 @@ static const struct udevice_id stm32_ipcc_ids[] = {
struct mbox_ops stm32_ipcc_mbox_ops = { struct mbox_ops stm32_ipcc_mbox_ops = {
.request = stm32_ipcc_request, .request = stm32_ipcc_request,
.free = stm32_ipcc_free, .rfree = stm32_ipcc_free,
.send = stm32_ipcc_send, .send = stm32_ipcc_send,
.recv = stm32_ipcc_recv, .recv = stm32_ipcc_recv,
}; };

View File

@ -175,7 +175,7 @@ static const struct udevice_id tegra_hsp_ids[] = {
struct mbox_ops tegra_hsp_mbox_ops = { struct mbox_ops tegra_hsp_mbox_ops = {
.of_xlate = tegra_hsp_of_xlate, .of_xlate = tegra_hsp_of_xlate,
.request = tegra_hsp_request, .request = tegra_hsp_request,
.free = tegra_hsp_free, .rfree = tegra_hsp_free,
.send = tegra_hsp_send, .send = tegra_hsp_send,
.recv = tegra_hsp_recv, .recv = tegra_hsp_recv,
}; };

View File

@ -49,14 +49,14 @@ struct mbox_ops {
*/ */
int (*request)(struct mbox_chan *chan); 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. * This is the implementation of the client mbox_free() API.
* *
* @chan: The channel to free. * @chan: The channel to free.
* @return 0 if OK, or a negative error code. * @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 * send - Send a message over a mailbox channel
* *