diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 05:56:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:10 -0400 |
commit | 33c4655c00e6af3ec4023f2cafd63dd4a42de49b (patch) | |
tree | 4d693872eb9641035dc15efc709424c9983b1348 /arch/sparc/include | |
parent | 71d3721189c0f4fad105a81e052bddfb826b693b (diff) |
sparc: Kill SBUS layer IRQ hooks.
IRQs are obtained by drivers from the of_device struct.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/sbus_32.h | 17 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbus_64.h | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h index 435ae394d2bd..81ea0f687b18 100644 --- a/arch/sparc/include/asm/sbus_32.h +++ b/arch/sparc/include/asm/sbus_32.h | |||
@@ -76,9 +76,6 @@ struct sbus_bus { | |||
76 | 76 | ||
77 | struct linux_prom_ranges sbus_ranges[PROMREG_MAX]; | 77 | struct linux_prom_ranges sbus_ranges[PROMREG_MAX]; |
78 | int num_sbus_ranges; | 78 | int num_sbus_ranges; |
79 | |||
80 | int devid; | ||
81 | int board; | ||
82 | }; | 79 | }; |
83 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) | 80 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) |
84 | 81 | ||
@@ -102,26 +99,12 @@ sbus_is_slave(struct sbus_dev *dev) | |||
102 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ | 99 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ |
103 | for ((device) = (bus)->devices; (device); (device) = (device)->next) | 100 | for ((device) = (bus)->devices; (device); (device) = (device)->next) |
104 | 101 | ||
105 | extern void sbus_fill_device_irq(struct sbus_dev *); | ||
106 | |||
107 | /* These yield IOMMU mappings in consistent mode. */ | 102 | /* These yield IOMMU mappings in consistent mode. */ |
108 | void prom_adjust_ranges(struct linux_prom_ranges *, int, | 103 | void prom_adjust_ranges(struct linux_prom_ranges *, int, |
109 | struct linux_prom_ranges *, int); | 104 | struct linux_prom_ranges *, int); |
110 | 105 | ||
111 | /* Eric Brower (ebrower@usa.net) | ||
112 | * Translate SBus interrupt levels to ino values-- | ||
113 | * this is used when converting sbus "interrupts" OBP | ||
114 | * node values to "intr" node values, and is platform | ||
115 | * dependent. If only we could call OBP with | ||
116 | * "sbus-intr>cpu (sbint -- ino)" from kernel... | ||
117 | * See .../drivers/sbus/sbus.c for details. | ||
118 | */ | ||
119 | BTFIXUPDEF_CALL(unsigned int, sbint_to_irq, struct sbus_dev *sdev, unsigned int) | ||
120 | #define sbint_to_irq(sdev, sbint) BTFIXUP_CALL(sbint_to_irq)(sdev, sbint) | ||
121 | |||
122 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); | 106 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); |
123 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); | 107 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); |
124 | extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *); | ||
125 | extern int sbus_arch_preinit(void); | 108 | extern int sbus_arch_preinit(void); |
126 | extern void sbus_arch_postinit(void); | 109 | extern void sbus_arch_postinit(void); |
127 | 110 | ||
diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h index 79719c2e5fa6..2b2562e0e5c1 100644 --- a/arch/sparc/include/asm/sbus_64.h +++ b/arch/sparc/include/asm/sbus_64.h | |||
@@ -94,11 +94,8 @@ extern struct sbus_bus *sbus_root; | |||
94 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ | 94 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ |
95 | for ((device) = (bus)->devices; (device); (device) = (device)->next) | 95 | for ((device) = (bus)->devices; (device); (device) = (device)->next) |
96 | 96 | ||
97 | extern void sbus_fill_device_irq(struct sbus_dev *); | ||
98 | |||
99 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); | 97 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); |
100 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); | 98 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); |
101 | extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *); | ||
102 | extern int sbus_arch_preinit(void); | 99 | extern int sbus_arch_preinit(void); |
103 | extern void sbus_arch_postinit(void); | 100 | extern void sbus_arch_postinit(void); |
104 | 101 | ||