From patchwork Wed Feb 19 19:39:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1240974 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uTX3Vsyl; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48N7Q32R98z9sRJ for ; Thu, 20 Feb 2020 06:41:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08729812E8; Wed, 19 Feb 2020 20:41:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uTX3Vsyl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BEE11812CF; Wed, 19 Feb 2020 20:40:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A8CAB812C6 for ; Wed, 19 Feb 2020 20:40:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=simon.k.r.goldschmidt@gmail.com Received: by mail-wr1-x442.google.com with SMTP id z3so1983190wru.3 for ; Wed, 19 Feb 2020 11:40:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MFMfbgIy3ybmhvDqGWRysk9ptEbW2kv6qFMH9UtS++E=; b=uTX3Vsylib5ZdNnP/Mcy+truu8GYDXcKK+tCF5ADDOx8hThmiNEtWBDkzP1pJYwj1R QzjqJN6TOExYqwu5oyDIVMxpOeA3+OXDgDD8sQdAHRDM0kMs3YOowvajbDuK983quBzu iVPcR4wfS0snog6L+toN7QdJOiFjb33dMAcEinOU126QOOO2HJ7KJUiRM82kBuy5gVzr wwGURomySkwvCU4b/oZX9dWJ9qpR043lZ+aBq+3Fbrox6hB0xT89xXn1TsNPprDl/C/W dNCS4jImva8CQbkz54rMkZDwWBFioO/PbdXnI9AbnE3ziOCK6sp2AZRR7iOB3w8zfVkk jEJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MFMfbgIy3ybmhvDqGWRysk9ptEbW2kv6qFMH9UtS++E=; b=K8oSOe8J0h6M6tNjBIThsOhIdeGlzgGkfChsZfc3UhgV3whPWUEx4IiUlQ7reHCags AG93/tY/P2hAoOKU8rbuDFB9RKx3Bmvl3eJPBmVYzBdpm6onVQ4MJInmS9sOM1PkBFaB e8C5M46czKxtZmWW3zkv7wCbcvee8z/TRHxHxLXylF8qSZlG1wYazMkDnhkeZTV8rLiF pAVn53yQykOFhWHjVylil5W3BX2lcIrcSwqEcvvchqDYIpVWV5L8fRJgNHZB9iz26lPZ 9GMmA2l8E8wo8XfYpRKcAmU7JJ8ATX8bJ4PwyoOFDifJck4ig0zfNOpeBSsQvRsK67MQ Rz3A== X-Gm-Message-State: APjAAAWp3kAeH0DEx/FcyGE0jPrJmSXayKQ4qDZr9Ey5Kec9xJDBAUOK pGhgrQQoC5Aweh7LE51yX6M= X-Google-Smtp-Source: APXvYqycYt0zHdB5dvMi3DIN5oapPrUCugv/zyefuUlxzM4sPvIeM2rVfSkUM6nELJOo8SlWYEne3Q== X-Received: by 2002:a05:6000:8c:: with SMTP id m12mr37718850wrx.142.1582141253257; Wed, 19 Feb 2020 11:40:53 -0800 (PST) Received: from ubuntu.home ([2a02:8071:6cd:f600:c8f1:bb29:e51c:220f]) by smtp.gmail.com with ESMTPSA id r6sm1066250wrp.95.2020.02.19.11.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 11:40:52 -0800 (PST) From: Simon Goldschmidt To: Simon Glass Cc: Tom Rini , Masahiro Yamada , u-boot@lists.denx.de, Simon Goldschmidt Subject: [PATCH 8/8] Revert "mailbox: Rename free() to rfree()" Date: Wed, 19 Feb 2020 20:39:34 +0100 Message-Id: <20200219193934.28456-9-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200219193934.28456-1-simon.k.r.goldschmidt@gmail.com> References: <20200219193934.28456-1-simon.k.r.goldschmidt@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean This reverts commit cc92c3cc68a9053f53b2814e9233d86553cc998e. Signed-off-by: Simon Goldschmidt Reviewed-by: Simon Glass --- 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(-) 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 *