* [PATCH -mm 0/4] remove dma64_addr_t
@ 2010-10-12 3:13 FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 1/4] sparc: remove dma64_addr_t usage FUJITA Tomonori
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: FUJITA Tomonori @ 2010-10-12 3:13 UTC (permalink / raw)
To: akpm; +Cc: fujita.tomonori, linux-arch
dma64_addr_t looks pointless (at least there is no point that an
architecture has the own dma64_addr_t typedef).
dma_addr_t is set to 32 or 64 bits appropriately. You can use u64
at places where you know that 64 bit address is always necessary.
=
arch/alpha/include/asm/types.h | 11 -----------
arch/alpha/kernel/pci_iommu.c | 4 ++--
arch/arm/include/asm/types.h | 6 ------
arch/cris/include/asm/types.h | 6 ------
arch/m32r/include/asm/types.h | 6 ------
arch/m68k/include/asm/types.h | 6 ------
arch/mips/include/asm/pci/bridge.h | 2 +-
arch/mips/include/asm/types.h | 2 --
arch/parisc/include/asm/types.h | 13 -------------
arch/powerpc/include/asm/types.h | 2 --
arch/s390/include/asm/types.h | 2 --
arch/sparc/include/asm/pci_64.h | 2 +-
arch/sparc/include/asm/types.h | 18 ------------------
arch/x86/include/asm/types.h | 8 --------
14 files changed, 4 insertions(+), 84 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH -mm 1/4] sparc: remove dma64_addr_t usage
2010-10-12 3:13 [PATCH -mm 0/4] remove dma64_addr_t FUJITA Tomonori
@ 2010-10-12 3:13 ` FUJITA Tomonori
2010-10-12 6:28 ` David Miller
2010-10-12 3:13 ` [PATCH -mm 2/4] mips: " FUJITA Tomonori
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: FUJITA Tomonori @ 2010-10-12 3:13 UTC (permalink / raw)
To: akpm; +Cc: fujita.tomonori, linux-arch, David Miller
let's use u64 instead.
Looks like PCI654_REQUIRED_MASK or PCI64_ADR_BASE isn't used. They can
be removed?
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: David Miller <davem@davemloft.net>
---
arch/sparc/include/asm/pci_64.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 5312782..948b686 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -38,7 +38,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
* types on sparc64. However, it requires that the device
* can drive enough of the 64 bits.
*/
-#define PCI64_REQUIRED_MASK (~(dma64_addr_t)0)
+#define PCI64_REQUIRED_MASK (~(u64)0)
#define PCI64_ADDR_BASE 0xfffc000000000000UL
#ifdef CONFIG_PCI
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -mm 2/4] mips: remove dma64_addr_t usage
2010-10-12 3:13 [PATCH -mm 0/4] remove dma64_addr_t FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 1/4] sparc: remove dma64_addr_t usage FUJITA Tomonori
@ 2010-10-12 3:13 ` FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 3/4] alpha: " FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 4/4] remove dma64_addr_t FUJITA Tomonori
3 siblings, 0 replies; 7+ messages in thread
From: FUJITA Tomonori @ 2010-10-12 3:13 UTC (permalink / raw)
To: akpm; +Cc: fujita.tomonori, linux-arch, Ralf Baechle
let's use u64 instead.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
---
arch/mips/include/asm/pci/bridge.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index 5f4b9d4..f1f508e 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -839,7 +839,7 @@ struct bridge_controller {
nasid_t nasid;
unsigned int widget_id;
unsigned int irq_cpu;
- dma64_addr_t baddr;
+ u64 baddr;
unsigned int pci_int[8];
};
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -mm 3/4] alpha: remove dma64_addr_t usage
2010-10-12 3:13 [PATCH -mm 0/4] remove dma64_addr_t FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 1/4] sparc: remove dma64_addr_t usage FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 2/4] mips: " FUJITA Tomonori
@ 2010-10-12 3:13 ` FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 4/4] remove dma64_addr_t FUJITA Tomonori
3 siblings, 0 replies; 7+ messages in thread
From: FUJITA Tomonori @ 2010-10-12 3:13 UTC (permalink / raw)
To: akpm; +Cc: fujita.tomonori, linux-arch, linux-alpha
dma_addr_t is always 64 bit on alpha. So let's use dma_addr_t instead.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-alpha@vger.kernel.org
---
arch/alpha/kernel/pci_iommu.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index d1dbd9a..022c274 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -223,7 +223,7 @@ iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n)
*/
static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
{
- dma64_addr_t dac_offset = alpha_mv.pci_dac_offset;
+ dma_addr_t dac_offset = alpha_mv.pci_dac_offset;
int ok = 1;
/* If this is not set, the machine doesn't support DAC at all. */
@@ -756,7 +756,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,
spin_lock_irqsave(&arena->lock, flags);
for (end = sg + nents; sg < end; ++sg) {
- dma64_addr_t addr;
+ dma_addr_t addr;
size_t size;
long npages, ofs;
dma_addr_t tend;
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH -mm 4/4] remove dma64_addr_t
2010-10-12 3:13 [PATCH -mm 0/4] remove dma64_addr_t FUJITA Tomonori
` (2 preceding siblings ...)
2010-10-12 3:13 ` [PATCH -mm 3/4] alpha: " FUJITA Tomonori
@ 2010-10-12 3:13 ` FUJITA Tomonori
2010-10-12 6:28 ` David Miller
3 siblings, 1 reply; 7+ messages in thread
From: FUJITA Tomonori @ 2010-10-12 3:13 UTC (permalink / raw)
To: akpm; +Cc: fujita.tomonori, linux-arch
There is no user now.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
arch/alpha/include/asm/types.h | 11 -----------
arch/arm/include/asm/types.h | 6 ------
arch/cris/include/asm/types.h | 6 ------
arch/m32r/include/asm/types.h | 6 ------
arch/m68k/include/asm/types.h | 6 ------
arch/mips/include/asm/types.h | 2 --
arch/parisc/include/asm/types.h | 13 -------------
arch/powerpc/include/asm/types.h | 2 --
arch/s390/include/asm/types.h | 2 --
arch/sparc/include/asm/types.h | 18 ------------------
arch/x86/include/asm/types.h | 8 --------
11 files changed, 0 insertions(+), 80 deletions(-)
diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
index e46e503..8815443 100644
--- a/arch/alpha/include/asm/types.h
+++ b/arch/alpha/include/asm/types.h
@@ -20,15 +20,4 @@
typedef unsigned int umode_t;
#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
#endif /* _ALPHA_TYPES_H */
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
index c684e37..48192ac 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/asm/types.h
@@ -16,12 +16,6 @@ typedef unsigned short umode_t;
#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-
-typedef u32 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
index 4405508..551a12c 100644
--- a/arch/cris/include/asm/types.h
+++ b/arch/cris/include/asm/types.h
@@ -16,12 +16,6 @@ typedef unsigned short umode_t;
#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-
-typedef u32 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif
diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h
index fd84b48..bd00355 100644
--- a/arch/m32r/include/asm/types.h
+++ b/arch/m32r/include/asm/types.h
@@ -16,12 +16,6 @@ typedef unsigned short umode_t;
#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif /* _ASM_M32R_TYPES_H */
diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h
index 10ad92f..b17fd11 100644
--- a/arch/m68k/include/asm/types.h
+++ b/arch/m68k/include/asm/types.h
@@ -23,12 +23,6 @@ typedef unsigned short umode_t;
#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-
-typedef u32 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif /* _M68K_TYPES_H */
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 9520dc8..533812b 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -33,8 +33,6 @@ typedef unsigned short umode_t;
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
-typedef u64 dma64_addr_t;
-
/*
* Don't use phys_t. You've been warned.
*/
diff --git a/arch/parisc/include/asm/types.h b/arch/parisc/include/asm/types.h
index bc164dd..80e415c 100644
--- a/arch/parisc/include/asm/types.h
+++ b/arch/parisc/include/asm/types.h
@@ -9,17 +9,4 @@ typedef unsigned short umode_t;
#endif /* __ASSEMBLY__ */
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
#endif
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index e16a6b2..8947b98 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -44,8 +44,6 @@ typedef struct {
typedef __vector128 vector128;
-typedef u64 dma64_addr_t;
-
typedef struct {
unsigned long entry;
unsigned long toc;
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index f7f6ae6..eeb52cc 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -30,8 +30,6 @@ typedef __signed__ long saddr_t;
#ifndef __ASSEMBLY__
-typedef u64 dma64_addr_t;
-
#ifndef __s390x__
typedef union {
unsigned long long pair;
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h
index f02d330..91e5a03 100644
--- a/arch/sparc/include/asm/types.h
+++ b/arch/sparc/include/asm/types.h
@@ -18,24 +18,6 @@ typedef unsigned short umode_t;
#endif /* __ASSEMBLY__ */
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-#if defined(__arch64__)
-
-/*** SPARC 64 bit ***/
-typedef u64 dma64_addr_t;
-#else
-/*** SPARC 32 bit ***/
-typedef u32 dma64_addr_t;
-
-#endif /* defined(__arch64__) */
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
#endif /* defined(__sparc__) */
#endif /* defined(_SPARC_TYPES_H) */
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index 8810205..8e8c23f 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -3,12 +3,4 @@
#include <asm-generic/types.h>
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
#endif /* _ASM_X86_TYPES_H */
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH -mm 1/4] sparc: remove dma64_addr_t usage
2010-10-12 3:13 ` [PATCH -mm 1/4] sparc: remove dma64_addr_t usage FUJITA Tomonori
@ 2010-10-12 6:28 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2010-10-12 6:28 UTC (permalink / raw)
To: fujita.tomonori; +Cc: akpm, linux-arch
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 12 Oct 2010 12:13:12 +0900
> let's use u64 instead.
>
> Looks like PCI654_REQUIRED_MASK or PCI64_ADR_BASE isn't used. They can
> be removed?
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH -mm 4/4] remove dma64_addr_t
2010-10-12 3:13 ` [PATCH -mm 4/4] remove dma64_addr_t FUJITA Tomonori
@ 2010-10-12 6:28 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2010-10-12 6:28 UTC (permalink / raw)
To: fujita.tomonori; +Cc: akpm, linux-arch
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 12 Oct 2010 12:13:15 +0900
> There is no user now.
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-12 6:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-12 3:13 [PATCH -mm 0/4] remove dma64_addr_t FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 1/4] sparc: remove dma64_addr_t usage FUJITA Tomonori
2010-10-12 6:28 ` David Miller
2010-10-12 3:13 ` [PATCH -mm 2/4] mips: " FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 3/4] alpha: " FUJITA Tomonori
2010-10-12 3:13 ` [PATCH -mm 4/4] remove dma64_addr_t FUJITA Tomonori
2010-10-12 6:28 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.