From: Christoph Hellwig <hch@lst.de>
Cc: linux-arch@vger.kernel.org, linux-xtensa@linux-xtensa.org,
Michal Simek <monstr@monstr.eu>,
Vincent Chen <deanbo422@gmail.com>,
linux-c6x-dev@linux-c6x.org, linux-parisc@vger.kernel.org,
linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
openrisc@lists.librecores.org, Greentime Hu <green.hu@gmail.com>,
linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org,
nios2-dev@lists.rocketboards.org,
linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/22] alpha: simplify get_arch_dma_ops
Date: Fri, 20 Apr 2018 08:02:56 +0000 [thread overview]
Message-ID: <20180420080313.18796-6-hch@lst.de> (raw)
In-Reply-To: <20180420080313.18796-1-hch@lst.de>
Remove the dma_ops indirection.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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
next prev parent reply other threads:[~2018-04-20 8:02 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 8:02 Christoph Hellwig
2018-04-20 8:02 ` [PATCH 01/22] dma-debug: move initialization to common code Christoph Hellwig
2018-04-20 10:23 ` Robin Murphy
2018-04-24 7:35 ` Christoph Hellwig
2018-04-20 8:02 ` [PATCH 02/22] dma-mapping: simplify Kconfig dependencies Christoph Hellwig
2018-04-20 8:02 ` [PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation Christoph Hellwig
2018-04-20 8:02 ` [PATCH 04/22] alpha: use dma_direct_ops for jensen Christoph Hellwig
2018-04-20 8:02 ` Christoph Hellwig [this message]
2018-04-20 8:02 ` [PATCH 06/22] arc: use generic dma_noncoherent_ops Christoph Hellwig
2018-04-25 11:17 ` Alexey Brodkin
2018-04-26 6:45 ` hch
2018-04-26 8:25 ` hch
2018-04-20 8:02 ` [PATCH 07/22] arm-nommu: " Christoph Hellwig
2018-04-20 8:02 ` [PATCH 08/22] c6x: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 09/22] hexagon: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 10/22] m68k: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 11/22] microblaze: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 12/22] microblaze: remove the consistent_sync and consistent_sync_page Christoph Hellwig
2018-04-20 8:03 ` [PATCH 13/22] nds32: use generic dma_noncoherent_ops Christoph Hellwig
2018-04-23 6:49 ` Greentime Hu
2018-04-24 19:16 ` Christoph Hellwig
2018-04-25 1:43 ` Greentime Hu
2018-04-25 6:40 ` Christoph Hellwig
2018-04-25 12:25 ` Greentime Hu
2018-04-26 6:42 ` Christoph Hellwig
2018-04-26 8:06 ` Greentime Hu
2018-04-26 8:24 ` Christoph Hellwig
2018-04-26 9:39 ` Greentime Hu
2018-04-20 8:03 ` [PATCH 14/22] nios2: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 15/22] openrisc: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 16/22] sh: simplify get_arch_dma_ops Christoph Hellwig
2018-04-20 8:03 ` [PATCH 17/22] sh: introduce a sh_cacheop_vaddr helper Christoph Hellwig
2018-04-20 8:03 ` [PATCH 18/22] sh: use dma_direct_ops for the CONFIG_DMA_COHERENT case Christoph Hellwig
2018-04-20 8:03 ` [PATCH 19/22] sh: use generic dma_noncoherent_ops Christoph Hellwig
2018-04-20 8:03 ` [PATCH 20/22] xtensa: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 21/22] sparc: " Christoph Hellwig
2018-04-20 8:03 ` [PATCH 22/22] parisc: " Christoph Hellwig
2018-04-21 17:43 ` Helge Deller
2018-04-21 21:52 ` James Bottomley
2018-04-25 7:21 ` Christoph Hellwig
2018-04-25 21:07 ` Helge Deller
2018-04-21 21:42 ` James Bottomley
2018-04-24 8:20 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180420080313.18796-6-hch@lst.de \
--to=hch@lst.de \
--cc=deanbo422@gmail.com \
--cc=green.hu@gmail.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=monstr@monstr.eu \
--cc=nios2-dev@lists.rocketboards.org \
--cc=openrisc@lists.librecores.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).