From patchwork Tue Jul 23 10:50:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831911 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0F9ACC031A for ; Tue, 23 Jul 2013 10:50:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D2872011E for ; Tue, 23 Jul 2013 10:50:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FF4820117 for ; Tue, 23 Jul 2013 10:50:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752128Ab3GWKuq (ORCPT ); Tue, 23 Jul 2013 06:50:46 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:51783 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753489Ab3GWKuO (ORCPT ); Tue, 23 Jul 2013 06:50:14 -0400 Received: from axis700.grange (dslb-094-220-153-077.pools.arcor-ip.net [94.220.153.77]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0M5cGS-1UD1n13c9g-00xuGq; Tue, 23 Jul 2013 12:50:12 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id BF41240BC3; Tue, 23 Jul 2013 12:50:10 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V1aAU-0007EM-FP; Tue, 23 Jul 2013 12:50:10 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , linux-sh@vger.kernel.org, Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v4 08/15] DMA: shdma: move two macros to a header Date: Tue, 23 Jul 2013 12:50:02 +0200 Message-Id: <1374576609-27748-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> References: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:YTuxAUMxv5sNisQ/hZp7UjAtJmGUSwaNHWmQEFv0vhB Pa+JNt8rXjOO2frjbUTZEBx63/A2gRxAPak3gNf2xO8vtmKP02 mPIvOGDHWaG/gqyBDsp4VldY3ktykfk+T1OHf40CXG2ui7PXlD 3bvziaAmnttBWhbCagCMF2T6RIUH1yjwzVUdeIn/Os24TPNyd3 327XEp2x9Oi9X4NwKewZQWSCq/RZndP4LkQ76DXDYZeNW//1ni YBiV/gjAqJEj7C996gXqcAfCa1Xc9XaQLqAlhMhztx4qs20A/W b/M7hNNhi6UaByB6NqBm64qWRJoT9FXgOqis5er1ADgU0NBYUu MOcdHV8/Da41dzstSgZ7220CzBJ+FMyoZwb9id2xoPYXtqtl+g UOxvfjPu1NwLQ== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move two generic pointer-conversion macros to a header for common shdma use. Signed-off-by: Guennadi Liakhovetski --- drivers/dma/sh/shdma-base.c | 3 --- drivers/dma/sh/shdma-of.c | 2 -- include/linux/shdma-base.h | 3 +++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index c5ea256..5b92e72 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -36,9 +36,6 @@ enum shdma_desc_status { #define NR_DESCS_PER_CHANNEL 32 -#define to_shdma_chan(c) container_of(c, struct shdma_chan, dma_chan) -#define to_shdma_dev(d) container_of(d, struct shdma_dev, dma_dev) - /* * For slave DMA we assume, that there is a finite number of DMA slaves in the * system, and that each such slave can only use a finite number of channels. diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c index 2acf7b6..80d07b5 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -17,8 +17,6 @@ #include #include -#define to_shdma_chan(c) container_of(c, struct shdma_chan, dma_chan) - static struct dma_chan *shdma_of_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index 31cf89f..45191d7 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h @@ -114,6 +114,9 @@ struct shdma_dev { #define shdma_for_each_chan(c, d, i) for (i = 0, c = (d)->schan[0]; \ i < (d)->dma_dev.chancnt; c = (d)->schan[++i]) +#define to_shdma_chan(c) container_of(c, struct shdma_chan, dma_chan) +#define to_shdma_dev(d) container_of(d, struct shdma_dev, dma_dev) + int shdma_request_irq(struct shdma_chan *, int, unsigned long, const char *); bool shdma_reset(struct shdma_dev *sdev);