From patchwork Thu Jun 8 13:26:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 65719603B4 for ; Thu, 8 Jun 2017 13:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56B1E26538 for ; Thu, 8 Jun 2017 13:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B63A28548; Thu, 8 Jun 2017 13:30:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E318A28543 for ; Thu, 8 Jun 2017 13:30:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUf-00064L-IQ; Thu, 08 Jun 2017 13:28:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUe-00061N-M3 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:28:56 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id C2/DB-02180-81159395; Thu, 08 Jun 2017 13:28:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsXiaHS5VVc80DL SYNNHNovvWyYzOTB6HP5whSWAMYo1My8pvyKBNeP2hz8sBReEK7ZMesnawLhQsIuRi4NF4ASb xJ13PWwgjpDACUaJs2sbWLsYOTnYBFQk3jzvYQdJiAgcYpE4+eYoE0iCWUBB4te9TWBFwgLeE peezwGyOYBGqUr0n0kHCfMKGEi0LdwIViIhIC+xq+0imM0JFG85vQtsjJCAvsShBdOYQeZLCL QwSrRdXMEygZFnASPDKkb14tSistQiXVO9pKLM9IyS3MTMHF1DA1O93NTi4sT01JzEpGK95Pz cTYxAzzMAwQ7GL/3OhxglOZiURHkVBSwjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw3vAHygkW paanVqRl5gBDECYtwcGjJML73wcozVtckJhbnJkOkTrFqCglzlsA0icAksgozYNrg4X9JUZZK WFeRqBDhHgKUotyM0tQ5V8xinMwKgnzuvkCTeHJzCuBm/4KaDET0OIl7yxAFpckIqSkGhg5P4 S+LFoj4G0pMl22oUXjEEtW9ouPcQ12r1YrrXP5UW5qsbhuWv+TF5peGxer298Pbf4s8cps/vq FPhemeGl8Dez+JZ9o4vul74Xy+p28bBqyM9oU+hyMl0Vmn2Sc3xV0lyN+nVFqtPrNBpcHzZ4q DdzH712+UKAz8b2H6nWrlgX3GlY/f6rEUpyRaKjFXFScCABKVSfJdgIAAA== X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1496928533!99587998!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10245 invoked from network); 8 Jun 2017 13:28:54 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-7.tower-206.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:28:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WCFl8gyLH+Dtw1N5AT1LVFwtyWKYQDQAq3hDiEm/z10=; b=NfRvftwZfLNL/J/Wh5Uv+ge1o zD9qlb7mf9yIiA6ED1uahM10VNNQk+8kc5Uv6ZWi4QVx9iqBCOKSd3BZufJnb4BdP1WbY4MO2LUrg cu8llUtegkqDqtWiY7DgD5t1cIZDIfhU5gTODYCnvSyNCvsqH36Wfznfe/mbN2r9UDTk189e7mvJZ yYMiVxR7iin+jffGOoGmRfyARbNjwXZRvVN7m5I2fIoPVEVW5YkztYojmrHGhFxBJVpIjbmIU7D5O Okc98peBlMV7c0siGAyV/hBg/P/m7tyyrk5vls2ADi4M0bzt4jeEEvhOHaB+gfvkL1QaCIMPHP2x8 f0oS+rW3g==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dIxUX-0008AI-Tm; Thu, 08 Jun 2017 13:28:51 +0000 From: Christoph Hellwig To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, openrisc@lists.librecores.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, iommu@lists.linux-foundation.org, netdev@vger.kernel.org Date: Thu, 8 Jun 2017 15:26:05 +0200 Message-Id: <20170608132609.32662-41-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608132609.32662-1-hch@lst.de> References: <20170608132609.32662-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH 40/44] tile: remove dma_supported and mapping_error methods X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP These just duplicate the default behavior if no method is provided. Signed-off-by: Christoph Hellwig --- arch/tile/kernel/pci-dma.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c index 569bb6dd154a..f2abedc8a080 100644 --- a/arch/tile/kernel/pci-dma.c +++ b/arch/tile/kernel/pci-dma.c @@ -317,18 +317,6 @@ static void tile_dma_sync_sg_for_device(struct device *dev, } } -static inline int -tile_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - return 0; -} - -static inline int -tile_dma_supported(struct device *dev, u64 mask) -{ - return 1; -} - static const struct dma_map_ops tile_default_dma_map_ops = { .alloc = tile_dma_alloc_coherent, .free = tile_dma_free_coherent, @@ -340,8 +328,6 @@ static const struct dma_map_ops tile_default_dma_map_ops = { .sync_single_for_device = tile_dma_sync_single_for_device, .sync_sg_for_cpu = tile_dma_sync_sg_for_cpu, .sync_sg_for_device = tile_dma_sync_sg_for_device, - .mapping_error = tile_dma_mapping_error, - .dma_supported = tile_dma_supported }; const struct dma_map_ops *tile_dma_map_ops = &tile_default_dma_map_ops; @@ -504,18 +490,6 @@ static void tile_pci_dma_sync_sg_for_device(struct device *dev, } } -static inline int -tile_pci_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - return 0; -} - -static inline int -tile_pci_dma_supported(struct device *dev, u64 mask) -{ - return 1; -} - static const struct dma_map_ops tile_pci_default_dma_map_ops = { .alloc = tile_pci_dma_alloc_coherent, .free = tile_pci_dma_free_coherent, @@ -527,8 +501,6 @@ static const struct dma_map_ops tile_pci_default_dma_map_ops = { .sync_single_for_device = tile_pci_dma_sync_single_for_device, .sync_sg_for_cpu = tile_pci_dma_sync_sg_for_cpu, .sync_sg_for_device = tile_pci_dma_sync_sg_for_device, - .mapping_error = tile_pci_dma_mapping_error, - .dma_supported = tile_pci_dma_supported }; const struct dma_map_ops *gx_pci_dma_map_ops = &tile_pci_default_dma_map_ops; @@ -578,8 +550,6 @@ static const struct dma_map_ops pci_hybrid_dma_ops = { .sync_single_for_device = tile_pci_dma_sync_single_for_device, .sync_sg_for_cpu = tile_pci_dma_sync_sg_for_cpu, .sync_sg_for_device = tile_pci_dma_sync_sg_for_device, - .mapping_error = tile_pci_dma_mapping_error, - .dma_supported = tile_pci_dma_supported }; const struct dma_map_ops *gx_legacy_pci_dma_map_ops = &pci_swiotlb_dma_ops;