Received: by 10.192.165.148 with SMTP id m20csp420207imm; Fri, 20 Apr 2018 01:18:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/ITwqwKSZN3oVpna6qRZvGZoFl53pWn3tx5MV7UrGI3a9D4ABP2XBAjZgx+S5Rwgg0l2zG X-Received: by 10.99.47.4 with SMTP id v4mr8016842pgv.42.1524212301252; Fri, 20 Apr 2018 01:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524212301; cv=none; d=google.com; s=arc-20160816; b=nlwEprPXsVfYtMdBvgb+/tXFeVFv7Z0bRzxYuJ5e4yZ6zXebxGueMkvnd7hUd+FWcd eMgfsU3QS/UTS9MAPd+d7eUYGHiemZ3UaeSlJXtPZb/04kJT8I/ZLqLRcsVl4qu2bRNc 9jSEj0Ku/fvAni1mXvVERg0kdOLZO+gKstnCLPa1jLg2OuzyEk+sF0R2B5kyTLg8bwQb yFjqYMVH5yC+NoGBDS5CH/ip5efuRdmwmEoh7pIu0AdiNKvmTVBekj4EYIAvfkpE5l5I hR3sLOzvzFZ3eMstdV27cxy+PrPsFiXnWKKGIoRMlTN0vEv+OG6cCSnI87XP3FFiFiL8 MfoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:references:in-reply-to:message-id:date :subject:cc:from:dkim-signature:arc-authentication-results; bh=6YsxktIFApfljqDxCaSnQ3rBiukrtF50KorjTad9lzY=; b=dUM3RiwmB7UoTwZ1EjqvxUDC/5XroVh0NmFTCUvBEx3QvlAmrIjONVs89ZSMV1DNyw wJc5Qw4DijVWsa9mkBKSlR3ufNLePY+mZmkMZcloUlclQe71vQ+ryk4USZYoYu7qyfdF MddpNGAyZgtj61IhdSBNB6Npx8y2m60x7DEIeqVS3T1HZHDHCtsXMkpnx8l81RJsh+mH xwrVCk+rEVxI0k6jNWFQjtMiE7k4n3ySQ27FfZMsOddXbi5UVKHBgSVPDJHrxtHmF9KF /6w5aptlDxy6vgQRZ9fIL6vdkCL+xj5zn6yi03/5hsAmPz9Rw3tCfr7XEVWWNpKvPxBG MdJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=aIEm1uiX; 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 p5si4245090pgu.158.2018.04.20.01.18.06; Fri, 20 Apr 2018 01:18:21 -0700 (PDT) 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=aIEm1uiX; 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 S1754200AbeDTIQ4 (ORCPT + 99 others); Fri, 20 Apr 2018 04:16:56 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:39700 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754054AbeDTIEH (ORCPT ); Fri, 20 Apr 2018 04:04:07 -0400 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=6YsxktIFApfljqDxCaSnQ3rBiukrtF50KorjTad9lzY=; b=aIEm1uiXwOl0D2A4uWtdgMQnr qulqMbspjiNnrFL52OdgiZFBr85m9Ft5GNDxAH8AC9mPAAxK59YsHQ74PwRQ0y+/rksZ0Z3KSbxqb gErvU3YSBbfQcXIGqb4Jxpyvnn9wRS/qQNQtscp9fTc5vTfMhHutQx4mm6IGwDjLnY+6elwcob9iR 8c4dSMFaXgLbdzpKySVHkCu5JPKucowquY6sUqlXhL8LKARZiT+i3YUHAXL1LkFPrQp3xamXYsZOI DahqIhTZJ4ZaTJC93ua1TKAi6XMyfOtzzzgaItjmhR0utz1n/R1Fkf6TMhVtHls5FqF1f5kxwTy0m A6AZXa78g==; Received: from static-242-42-24-46.ipcom.comunitel.net ([46.24.42.242] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1f9R12-0007LO-4S; Fri, 20 Apr 2018 08:03:32 +0000 From: Christoph Hellwig Cc: linux-arch@vger.kernel.org, Michal Simek , Greentime Hu , Vincent Chen , linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/22] alpha: simplify get_arch_dma_ops Date: Fri, 20 Apr 2018 10:02:56 +0200 Message-Id: <20180420080313.18796-6-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420080313.18796-1-hch@lst.de> References: <20180420080313.18796-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the dma_ops indirection. Signed-off-by: Christoph Hellwig --- arch/alpha/include/asm/dma-mapping.h | 4 ++-- arch/alpha/kernel/pci_iommu.c | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index 76ce923ecca1..8beeafd4f68e 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h @@ -2,14 +2,14 @@ #ifndef _ALPHA_DMA_MAPPING_H #define _ALPHA_DMA_MAPPING_H -extern const struct dma_map_ops *dma_ops; +extern const struct dma_map_ops alpha_pci_ops; static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) { #ifdef CONFIG_ALPHA_JENSEN return &dma_direct_ops; #else - return dma_ops; + return &alpha_pci_ops; #endif } diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 83b34b9188ea..6923b0d9c1e1 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -950,6 +950,4 @@ const struct dma_map_ops alpha_pci_ops = { .mapping_error = alpha_pci_mapping_error, .dma_supported = alpha_pci_supported, }; - -const struct dma_map_ops *dma_ops = &alpha_pci_ops; -EXPORT_SYMBOL(dma_ops); +EXPORT_SYMBOL(alpha_pci_ops); -- 2.17.0