Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6399730imu; Wed, 14 Nov 2018 00:27:47 -0800 (PST) X-Google-Smtp-Source: AJdET5cufWzW+0k3BXSpEeBjHn/Vqj18qJeXUizaKQafANJPB6QTHlnn1cUIzYPc6RRt+32nH41V X-Received: by 2002:a17:902:8d83:: with SMTP id v3-v6mr999002plo.162.1542184067682; Wed, 14 Nov 2018 00:27:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542184067; cv=none; d=google.com; s=arc-20160816; b=tn60TpqDYIx9sNYASa21eY7wCh4bXBbapF6P2IWrIWKC5oGrOG/gRfvsSklVtq6bDc zdA/9rsXV9R9XpFZ2lPTXuPLKbG06ZZuhxXHNtV5O9DBCpCxvJ+s5EZnwhRKSH9iYwDG WY5IsGnWrwV7dxbjRT+oP36uKj+pjxYOMlYh95GzEelbDBSVRB8E1DJnsEq7fCGE1orb oH4op7UJsa5q5LeSMb4IDURi9rmdVAATGo3f+6oViXt0E27lkV+KWgzqnjPChm/8QbcO iODkkMDIR2OZVvMTW1Hm3B5mbfxRjJmcqs4UkABAG1QXtStCKW591CCTOGsUD+a/5rUE KSVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NBkFYJGKKcrI5DQk0s6JVvJBqVHO59rIQyipdUjAnUk=; b=G35Lgmic8QwzAy9C1HUSVTk8UyjhC1RZprpR7c5OFyP3v2cFqOYTyMmVq2RcLlLRaK V9NoRYxXZywobtq6BtGaTbQa/mYEvzI2uc3/r3I24Irp8rojLG7cAmAU8SzZWVJ7Lvsp Iqn6MceTq07r5d0llGSGU7qP8XujfwJRazpU4hrXpZg9k54yUB6Rwc+FH5QncjtF8/Kg N4opcdC+j0z/Nv2QRWK+M6QyeGGYHeAicUcIA+tldtaOPgiraIozoEZHubJVVXvCDbL9 rl61EqFNItMwn+OW5eH52MyNBNnOrALJ1iX5a4EoXaEDA2KBzGfCiPapZeKJl3xT1UcE vnWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CusMZCxS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12-v6si23030551plt.215.2018.11.14.00.27.33; Wed, 14 Nov 2018 00:27:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=CusMZCxS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732570AbeKNS0H (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:07 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49422 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731357AbeKNS0G (ORCPT ); Wed, 14 Nov 2018 13:26:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=NBkFYJGKKcrI5DQk0s6JVvJBqVHO59rIQyipdUjAnUk=; b=CusMZCxSeFVIO1ZaEvdv+uooHo hFAHBWGuK9HBfjXPmDqyfkQhNgi1gNgwgVsUyJlkL2NnqvhrQyyFcLYtaLq27l8cU2OSTwGOnZWk0 kopJtbSk0VFh2EXS3izk1PhAp2lzbrhlpofZ65Cztl5kj2B5YeJbzN9PsXWXvXwqDoYC30in/Qd1y eC8tchaYitVMx2mY/tKlK/3kLmgYkMMSqzT7HYT5tingkR/e/0kOqBYDL0loW9BxTb+gVTmmxuatV N/w1MHAFLUzg9LDTl5L7PSkeFj6z0FO+3t6vQUgocFDvXKFw+pQCbqalGatFby4tGvAbAT4EGtD4U LEUFyRLg==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqSV-0004ok-Le; Wed, 14 Nov 2018 08:23:36 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/34] powerpc/dma: remove the no-op dma_nommu_unmap_{page,sg} routines Date: Wed, 14 Nov 2018 09:22:47 +0100 Message-Id: <20181114082314.8965-8-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These methods are optional, no need to implement no-op versions. Signed-off-by: Christoph Hellwig Acked-by: Benjamin Herrenschmidt --- arch/powerpc/kernel/dma.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index d6deb458bb91..7078d72baec2 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -197,12 +197,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, return nents; } -static void dma_nommu_unmap_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - unsigned long attrs) -{ -} - static u64 dma_nommu_get_required_mask(struct device *dev) { u64 end, mask; @@ -228,14 +222,6 @@ static inline dma_addr_t dma_nommu_map_page(struct device *dev, return page_to_phys(page) + offset + get_dma_offset(dev); } -static inline void dma_nommu_unmap_page(struct device *dev, - dma_addr_t dma_address, - size_t size, - enum dma_data_direction direction, - unsigned long attrs) -{ -} - #ifdef CONFIG_NOT_COHERENT_CACHE static inline void dma_nommu_sync_sg(struct device *dev, struct scatterlist *sgl, int nents, @@ -261,10 +247,8 @@ const struct dma_map_ops dma_nommu_ops = { .free = dma_nommu_free_coherent, .mmap = dma_nommu_mmap_coherent, .map_sg = dma_nommu_map_sg, - .unmap_sg = dma_nommu_unmap_sg, .dma_supported = dma_nommu_dma_supported, .map_page = dma_nommu_map_page, - .unmap_page = dma_nommu_unmap_page, .get_required_mask = dma_nommu_get_required_mask, #ifdef CONFIG_NOT_COHERENT_CACHE .sync_single_for_cpu = dma_nommu_sync_single, -- 2.19.1