| Message ID | 20200219193934.28456-9-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | malloc: implement USE_DL_PREFIX using inline functions | expand |
On Wed, 19 Feb 2020 at 12:40, Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> wrote: > > This reverts commit cc92c3cc68a9053f53b2814e9233d86553cc998e. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> > --- > > drivers/mailbox/k3-sec-proxy.c | 2 +- > drivers/mailbox/mailbox-uclass.c | 4 ++-- > drivers/mailbox/sandbox-mbox.c | 2 +- > drivers/mailbox/stm32-ipcc.c | 2 +- > drivers/mailbox/tegra-hsp.c | 2 +- > include/mailbox-uclass.h | 4 ++-- > 6 files changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Simon Glass <sjg at chromium.org>
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index a560209f03..0546752f5f 100644 --- a/drivers/mailbox/k3-sec-proxy.c +++ b/drivers/mailbox/k3-sec-proxy.c @@ -293,7 +293,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, - .rfree = k3_sec_proxy_free, + .free = 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 291f5c218e..f408f05cf9 100644 --- a/drivers/mailbox/mailbox-uclass.c +++ b/drivers/mailbox/mailbox-uclass.c @@ -106,8 +106,8 @@ int mbox_free(struct mbox_chan *chan) debug("%s(chan=%p)\n", __func__, chan); - if (ops->rfree) - return ops->rfree(chan); + if (ops->free) + return ops->free(chan); return 0; } diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c index 25e23eb05b..0f09dfa951 100644 --- a/drivers/mailbox/sandbox-mbox.c +++ b/drivers/mailbox/sandbox-mbox.c @@ -88,7 +88,7 @@ static const struct udevice_id sandbox_mbox_ids[] = { struct mbox_ops sandbox_mbox_mbox_ops = { .request = sandbox_mbox_request, - .rfree = sandbox_mbox_free, + .free = 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 13e642ab70..c58d9fa001 100644 --- a/drivers/mailbox/stm32-ipcc.c +++ b/drivers/mailbox/stm32-ipcc.c @@ -154,7 +154,7 @@ static const struct udevice_id stm32_ipcc_ids[] = { struct mbox_ops stm32_ipcc_mbox_ops = { .request = stm32_ipcc_request, - .rfree = stm32_ipcc_free, + .free = 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 60f6a38321..00fc3972f9 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -176,7 +176,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, - .rfree = tegra_hsp_free, + .free = tegra_hsp_free, .send = tegra_hsp_send, .recv = tegra_hsp_recv, }; diff --git a/include/mailbox-uclass.h b/include/mailbox-uclass.h index 3c60c76506..e0618aad97 100644 --- a/include/mailbox-uclass.h +++ b/include/mailbox-uclass.h @@ -49,14 +49,14 @@ struct mbox_ops { */ int (*request)(struct mbox_chan *chan); /** - * rfree - Free a previously requested channel. + * free - 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 (*rfree)(struct mbox_chan *chan); + int (*free)(struct mbox_chan *chan); /** * send - Send a message over a mailbox channel *
This reverts commit cc92c3cc68a9053f53b2814e9233d86553cc998e. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com> --- drivers/mailbox/k3-sec-proxy.c | 2 +- drivers/mailbox/mailbox-uclass.c | 4 ++-- drivers/mailbox/sandbox-mbox.c | 2 +- drivers/mailbox/stm32-ipcc.c | 2 +- drivers/mailbox/tegra-hsp.c | 2 +- include/mailbox-uclass.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-)