diff options
author | Tejun Heo <tj@kernel.org> | 2009-09-22 04:34:17 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-04 11:47:10 -0500 |
commit | 4c0eec7a86303ce6e3edf7825d0ef1d414e76767 (patch) | |
tree | 21a073cf9669861cc28593d23ad59bf3dcb9a732 /arch/sparc | |
parent | ac1aa47b131416a6ff37eb1005a0a1d2541aad6c (diff) |
sparc64/PCI: drop PCI_CACHE_LINE_BYTES
sparc64 is now the only user of PCI_CACHE_LINE_BYTES. Drop it and set
pci_dfl_cache_line_size from pcibios_init() instead and drop
PCI_CACHE_LINE_BYTES handling from generic pci code.
Orignally-From: David Miller <davem@davemloft.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/pci_64.h | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/pci.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h index b63e51c3c3ee..b0576df6ec83 100644 --- a/arch/sparc/include/asm/pci_64.h +++ b/arch/sparc/include/asm/pci_64.h | |||
@@ -16,8 +16,6 @@ | |||
16 | 16 | ||
17 | #define PCI_IRQ_NONE 0xffffffff | 17 | #define PCI_IRQ_NONE 0xffffffff |
18 | 18 | ||
19 | #define PCI_CACHE_LINE_BYTES 64 | ||
20 | |||
21 | static inline void pcibios_set_master(struct pci_dev *dev) | 19 | static inline void pcibios_set_master(struct pci_dev *dev) |
22 | { | 20 | { |
23 | /* No special bus mastering setup handling */ | 21 | /* No special bus mastering setup handling */ |
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index c68648662802..b85374f7cf94 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c | |||
@@ -1081,3 +1081,10 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar, | |||
1081 | *start = rp->start - offset; | 1081 | *start = rp->start - offset; |
1082 | *end = rp->end - offset; | 1082 | *end = rp->end - offset; |
1083 | } | 1083 | } |
1084 | |||
1085 | static int __init pcibios_init(void) | ||
1086 | { | ||
1087 | pci_dfl_cache_line_size = 64 >> 2; | ||
1088 | return 0; | ||
1089 | } | ||
1090 | subsys_initcall(pcibios_init); | ||