From patchwork Thu Jun 8 13:26:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9774875 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 06EE160393 for ; Thu, 8 Jun 2017 13:30:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED14B28534 for ; Thu, 8 Jun 2017 13:30:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E17092853E; Thu, 8 Jun 2017 13:30:12 +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 81AAA28553 for ; Thu, 8 Jun 2017 13:30:12 +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 1dIxUc-0005y7-Ak; Thu, 08 Jun 2017 13:28:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxUb-0005ve-A7 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:28:53 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id B3/B8-06719-41159395; Thu, 08 Jun 2017 13:28:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRWlGSWpSXmKPExsXiaHS5VVc40DL SoPGCucX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnHtwgemgq2cFZv3bWFrYJzC0cXIxcEicIJN 4uOcLjYQR0jgBKPEhRe7GLsYOTnYBFQk3jzvYQdJiAgcYpE4+eYoE0iCWUBB4te9TawgtrCAs 8TPe5OBGjiARqlK/FqfDBLmFTCQaP3VxwZiSwjIS+xquwhWzgkUbzm9C2yMkIC+xKEF05hB5k sItDBKtF1cwTKBkWcBI8MqRo3i1KKy1CJdIxO9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK 95PzcTYxA3zMAwQ7GfR8jDzFKcjApifIqClhGCvEl5adUZiQWZ8QXleakFh9ilOHgUJLgveEP lBMsSk1PrUjLzAEGIUxagoNHSYT3vw9Qmre4IDG3ODMdInWKUZdjw+r1X5iEWPLy81KlxHnvg swQACnKKM2DGwGLiEuMslLCvIxARwnxFKQW5WaWoMq/YhTnYFQS5nXzBZrCk5lXArfpFdARTE BHLHlnAXJESSJCSqqBsZ77ZIno2f608iPbuXtnijvWh5zu+X04a0uF+MMJIrt3OeyuWuC7fXm G+hV27hmcK4yWdwkVFJ21MzTgM/rbwCVRdMtFVta4l+H7L+vUtxdeVMVeKy+r+xK31MbRe7Hh gpawW3X+buV7k2xsyv5ocP9tXRDM0qTB5Xgt7+inKultjzdvT5yhxFKckWioxVxUnAgAydrXd IMCAAA= X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1496928530!49884457!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62107 invoked from network); 8 Jun 2017 13:28:51 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-6.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:28:51 -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=YP1GlHzuDHzeCHOaI6bMloC7cS7wXS8NaF48ukdIL/w=; b=MIqJidB7CzauxCvk4PRBWUPcE FT1Dz6eNgpbdTzRlDFC1B8K2haXebLYreGohUVuYJMvPsIuDbwD3cY8URC1X4OrGdB4reaTVxrx54 gHza59GOocacVGKFVxHU3c9gWCggXW+iUscC8aL3t2bBNQEw410p+ROemOsASzNlWQTDBLPEb/t7e OTwicLdUdzCXdaPCoH4lVnYAkUYUuvit2lx5jsUxR+cOe9fUNX73yhAy+Cmn1TghOlF+T8fVr7KEn RTEtnx+z7uTJTgU3eDKPZsLokZtkA9N9g0GotuHseB0lR1jB6fqtsVy0Y9a9z0ORoz16EcxDF06OW mNlPQJYQA==; 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 1dIxUU-000853-3Y; Thu, 08 Jun 2017 13:28:46 +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:04 +0200 Message-Id: <20170608132609.32662-40-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 39/44] xen-swiotlb: remove xen_swiotlb_set_dma_mask 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 This just duplicates the generic implementation. Signed-off-by: Christoph Hellwig --- drivers/xen/swiotlb-xen.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index c3a04b2d7532..82fc54f8eb77 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -661,17 +661,6 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask) return xen_virt_to_bus(xen_io_tlb_end - 1) <= mask; } -static int -xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) -{ - if (!dev->dma_mask || !xen_swiotlb_dma_supported(dev, dma_mask)) - return -EIO; - - *dev->dma_mask = dma_mask; - - return 0; -} - /* * Create userspace mapping for the DMA-coherent memory. * This function should be called with the pages from the current domain only, @@ -734,7 +723,6 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { .map_page = xen_swiotlb_map_page, .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, - .set_dma_mask = xen_swiotlb_set_dma_mask, .mmap = xen_swiotlb_dma_mmap, .get_sgtable = xen_swiotlb_get_sgtable, .mapping_error = xen_swiotlb_mapping_error,