From patchwork Tue Jan 21 09:33:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 11343253 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A2C26C1 for ; Tue, 21 Jan 2020 09:34:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32BE824656 for ; Tue, 21 Jan 2020 09:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728741AbgAUJeS (ORCPT ); Tue, 21 Jan 2020 04:34:18 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:46846 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729122AbgAUJeQ (ORCPT ); Tue, 21 Jan 2020 04:34:16 -0500 Received: from ramsan ([84.195.182.253]) by albert.telenet-ops.be with bizsmtp id sxaD2100M5USYZQ06xaDCK; Tue, 21 Jan 2020 10:34:14 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1itpvI-0008IS-KR; Tue, 21 Jan 2020 10:34:12 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1itpuM-0007Ss-21; Tue, 21 Jan 2020 10:33:14 +0100 From: Geert Uytterhoeven To: Vinod Koul Cc: Dan Williams , Lars-Peter Clausen , Matt Porter , Arnd Bergmann , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 1/3] dmaengine: Remove dma_device_satisfies_mask() wrapper Date: Tue, 21 Jan 2020 10:33:09 +0100 Message-Id: <20200121093311.28639-2-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200121093311.28639-1-geert+renesas@glider.be> References: <20200121093311.28639-1-geert+renesas@glider.be> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Commit aa1e6f1a385eb2b0 ("dmaengine: kill struct dma_client and supporting infrastructure") removed the last user of the dma_device_satisfies_mask() wrapper. Remove the wrapper, and rename __dma_device_satisfies_mask() to dma_device_satisfies_mask(), to get rid of one more function starting with a double underscore. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by, - Rebase on top of today's slave-dma/next. --- drivers/dma/dmaengine.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 158aeb1b6a8abd7f..7550dbdf548833ed 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -308,11 +308,8 @@ static void dma_channel_rebalance(void) } } -#define dma_device_satisfies_mask(device, mask) \ - __dma_device_satisfies_mask((device), &(mask)) -static int -__dma_device_satisfies_mask(struct dma_device *device, - const dma_cap_mask_t *want) +static int dma_device_satisfies_mask(struct dma_device *device, + const dma_cap_mask_t *want) { dma_cap_mask_t has; @@ -531,7 +528,7 @@ static struct dma_chan *private_candidate(const dma_cap_mask_t *mask, { struct dma_chan *chan; - if (mask && !__dma_device_satisfies_mask(dev, mask)) { + if (mask && !dma_device_satisfies_mask(dev, mask)) { dev_dbg(dev->dev, "%s: wrong capabilities\n", __func__); return NULL; }