From patchwork Wed Nov 14 08:22:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10682117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5AD57139B for ; Wed, 14 Nov 2018 08:24:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51D1D2AFA3 for ; Wed, 14 Nov 2018 08:24:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45A692B1A2; Wed, 14 Nov 2018 08:24:02 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 292DB2B020 for ; Wed, 14 Nov 2018 08:24:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 910846B0270; Wed, 14 Nov 2018 03:23:56 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 870946B0271; Wed, 14 Nov 2018 03:23:56 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C3486B0272; Wed, 14 Nov 2018 03:23:56 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 25C686B0270 for ; Wed, 14 Nov 2018 03:23:56 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id w7-v6so11548529plp.9 for ; Wed, 14 Nov 2018 00:23:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NBkFYJGKKcrI5DQk0s6JVvJBqVHO59rIQyipdUjAnUk=; b=h4KxUzQcnkMw7fUPNovK8ouSPPSnhbN8Xg/W0xQzgr0Z/ojiMKfXcthuOmyfeo1a2L 7HxakuZ4NjqtqWXii01MFCKmG1UF6CNPoBBQtiDOj8kxUP6PxSuM8ixtRqB8ocgcXk97 NNUYCCeVV727nyqJ/9CTzD4D7kxRxQLATkxqP5jPEp9UP+EL12RyOhWKi6d5WU1cNyc7 KlOQUAZ2Kn1QgysgHM+GqJmrGCxNZ5XL3m4SN5Ma21i8kA1Hmwjy15CqWO1HFs503hdp DKAgkM0bwFPBhdjRC53Dk8hueHh2KrzvKDC3g0XfGmcSvSfO8UFHKRveKykUbkU5l+Zy wWRw== X-Gm-Message-State: AGRZ1gKX6Z2PmthzInuM1ohnbrUfUWJYKtLGRLCh1QoKLErWYJRtQorO gVUOeKcJTDF3KX5zoWi53dcS/U37vtcTyfyb6yzpbXk7Axia9bO8iPB1q2/bJsBr34l+9V9H55T pVqF+TPhl5LSddRlnS8dJwVdqFJdZbVw9NZ00a+ez4ukWr49KYZqeQ7b18arguRk= X-Received: by 2002:a62:da54:: with SMTP id w20-v6mr1002201pfl.106.1542183835820; Wed, 14 Nov 2018 00:23:55 -0800 (PST) X-Google-Smtp-Source: AJdET5fTau71mGLw6ELbUAZRVqLfWRlLiOKzN+5k5vWtST7VWCKuKiDLhMojT6BaiptS7WJZ8KZv X-Received: by 2002:a62:da54:: with SMTP id w20-v6mr1002172pfl.106.1542183835170; Wed, 14 Nov 2018 00:23:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183835; cv=none; d=google.com; s=arc-20160816; b=QLBR7m1mv78D+qEQdtd506KCDWONq9uFd/A9XsMgez7v2u9NO7JCQVGgvFGbTWSg61 yDfj1ITLO/J1ROgIzCibQYiB7tgYjQCAfyxwb8gsfu5EPtNsdpHjTUIc0lQs8djEbQrx m3RaeOt7WWg211E+OC5KRNRqWIvpZ3tNlct3qSLPMCfr8cBlW8Jaugjcu0n61QBZ8ctU CgGWshYeSd+HT+ubFFGSK+9xVxkU8XQfnHECSBNHRXPXZcriD/Q8JEZZnVz6HVQrdm3F 6CbBqTgF7BetEdOIdc0zQGbnCfgFCl54Xq0hopokfNZ56ws9Y3Y7vIzW5OLuce+3h4Z3 5fDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NBkFYJGKKcrI5DQk0s6JVvJBqVHO59rIQyipdUjAnUk=; b=wP+wT1qIEMm9dOEvyA7TV2QtgEsLXq8Zc/mH3cXDw6hQ7zTC9z3WG2DSXXJYLYEulz Z8aMvXe4E7nNS6mi8WVMlY5dZeHqNrd1pzjtZoDaVHFCEE3O3dOLkqHCACg1G5cOZ2PE xBHbNp6M4rxgVzOYVmZcFvxiQM20VwINwOORf2M5jBj8W2imB3IRGZikrGR2wvvFgjtj g2YjuDizq5GcMXOPHQtKCGrWeSz0Fwr9ruCdeMi1If3yznZjfnjIqgi1SG7wV6RsL065 A3RzN6Q1doLn0pHVqux+WTH3SZmRu4friNcafR5AXBokSDWKtUDrhHuEbpx+Q52J7BAg +j5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CusMZCxS; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id m1-v6si22157729pgb.476.2018.11.14.00.23.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:23:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CusMZCxS; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org 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 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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,