From patchwork Wed Feb 19 19:39:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1240970 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=rSuH+aJJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 48N7P35PS4z9sRJ for ; Thu, 20 Feb 2020 06:40:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8533812D1; Wed, 19 Feb 2020 20:40:31 +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="rSuH+aJJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5FAC5812C4; Wed, 19 Feb 2020 20:40:11 +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-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 8C7C3812AE for ; Wed, 19 Feb 2020 20:40:02 +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-x444.google.com with SMTP id w12so1989112wrt.2 for ; Wed, 19 Feb 2020 11:40:02 -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=WjEUz4nonqkV4Otj1Xt7i/FoUsvFc0qMdkZJ0WdeWhU=; b=rSuH+aJJCoC9SNxn6OBr2PSMALxCQAC8qcixg9RpfWnhRtVBkDkroyw8Qqye7CdCeP hj2ftBesyjRQpQUbdgUZ5WtP6dgWniwYpTtpSmRTWnQeW/NOzjX/RJX2EhDPS3Y/7ss+ 2jqoXCffNyQ9suWAg8Os20FISEXc9ZXLijNLlSe0ncWCd5FuKZjOnGHhR+GghW20nurs b7U26r26wQwPoQxUjG6qo2Wxydp4Ko8xh6CVMFqUuI3uhvtaeNO+NhDqzV2i46GndiEg brvm6XzyvURiHKzgcNFncrMVVVs97aa31JXL//vsvy+NbDz0LNDPLp7iGG46iD7S4+98 9kSg== 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=WjEUz4nonqkV4Otj1Xt7i/FoUsvFc0qMdkZJ0WdeWhU=; b=l4ccYnfPelnXW2lqFpp0Vf4iFpbBuR+Mje+y82i0PCJ6hZYxJ9kBV1J+Y8Et1Uud75 3rS+LbC8ghGEK4tyZC0BGfc/rT7nmFhHOmKigMoBmwIVzVaDzDK/2viLpirUjUzcDXTK 7h/v3e9pRxbS4K9HETJdF7UjEILn4MImy/ZaIap6+aK62VFvybBZ062U55VtfTPA8cQ5 RD6JoD4nOZQujLpMGocBcG8yvMW3kxCt/A8dtq8OYwCxsS7Vnh+/2rdiVP+FheOuYye0 QgskBEpENU/GLUV8VXCQAmwRVr+5XsrgChaoazZXU2mU+mnzWs+zrOQwWfft8pqkIGP3 Ifzw== X-Gm-Message-State: APjAAAWNNcBdNd96sAqQZyZtUUNuVNwIoqOW8JwuQanXmKhPskI0oBKF WLOhFSnmQAJQ1rva8ULAmAr4aXDo X-Google-Smtp-Source: APXvYqyAdhlv4lshMDcATsKKGpzWAHOs+BEwJHBzKpgv6j50B1O1CTnkux9dm8IxaTLosiaP6bUK/w== X-Received: by 2002:adf:b60f:: with SMTP id f15mr39152825wre.372.1582141201968; Wed, 19 Feb 2020 11:40:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 11:40:01 -0800 (PST) From: Simon Goldschmidt To: Simon Glass Cc: Tom Rini , Masahiro Yamada , u-boot@lists.denx.de, Simon Goldschmidt Subject: [PATCH 3/8] Revert "dma: Rename free() to rfree()" Date: Wed, 19 Feb 2020 20:39:29 +0100 Message-Id: <20200219193934.28456-4-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 aae95882232a24ee49c89d0356febf3685a87c8a. Signed-off-by: Simon Goldschmidt Reviewed-by: Simon Glass --- drivers/dma/dma-uclass.c | 4 ++-- drivers/dma/sandbox-dma-test.c | 4 ++-- drivers/dma/ti/k3-udma.c | 4 ++-- include/dma-uclass.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 9d5a7fc796..68e17ed1f9 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -123,10 +123,10 @@ int dma_free(struct dma *dma) debug("%s(dma=%p)\n", __func__, dma); - if (!ops->rfree) + if (!ops->free) return 0; - return ops->rfree(dma); + return ops->free(dma); } int dma_enable(struct dma *dma) diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c index 234a7d2134..e8c809fa64 100644 --- a/drivers/dma/sandbox-dma-test.c +++ b/drivers/dma/sandbox-dma-test.c @@ -89,7 +89,7 @@ static int sandbox_dma_request(struct dma *dma) return 0; } -static int sandbox_dma_rfree(struct dma *dma) +static int sandbox_dma_free(struct dma *dma) { struct sandbox_dma_dev *ud = dev_get_priv(dma->dev); struct sandbox_dma_chan *uc; @@ -230,7 +230,7 @@ static const struct dma_ops sandbox_dma_ops = { .transfer = sandbox_dma_transfer, .of_xlate = sandbox_dma_of_xlate, .request = sandbox_dma_request, - .rfree = sandbox_dma_rfree, + .free = sandbox_dma_free, .enable = sandbox_dma_enable, .disable = sandbox_dma_disable, .send = sandbox_dma_send, diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index f274100f32..d6eb6d9339 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1553,7 +1553,7 @@ static int udma_request(struct dma *dma) return 0; } -static int udma_rfree(struct dma *dma) +static int udma_free(struct dma *dma) { struct udma_dev *ud = dev_get_priv(dma->dev); struct udma_chan *uc; @@ -1848,7 +1848,7 @@ static const struct dma_ops udma_ops = { .transfer = udma_transfer, .of_xlate = udma_of_xlate, .request = udma_request, - .rfree = udma_rfree, + .free = udma_free, .enable = udma_enable, .disable = udma_disable, .send = udma_send, diff --git a/include/dma-uclass.h b/include/dma-uclass.h index 340437acc1..a1d9d26ac5 100644 --- a/include/dma-uclass.h +++ b/include/dma-uclass.h @@ -58,14 +58,14 @@ struct dma_ops { */ int (*request)(struct dma *dma); /** - * rfree - Free a previously requested dma. + * free - Free a previously requested dma. * * This is the implementation of the client dma_free() API. * * @dma: The DMA to free. * @return 0 if OK, or a negative error code. */ - int (*rfree)(struct dma *dma); + int (*free)(struct dma *dma); /** * enable() - Enable a DMA Channel. *