Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sparc: Remove dinky old-style SBUS probing facilities.

No drivers or code uses this stuff any more, every driver has been
converted over to OF device probing.

Signed-off-by: David S. Miller <davem@davemloft.net>

-42
-13
arch/sparc/include/asm/sbus_32.h
··· 65 65 }; 66 66 #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) 67 67 68 - extern struct sbus_bus *sbus_root; 69 - 70 68 static inline int 71 69 sbus_is_slave(struct sbus_dev *dev) 72 70 { 73 71 /* XXX Have to write this for sun4c's */ 74 72 return 0; 75 73 } 76 - 77 - /* Device probing routines could find these handy */ 78 - #define for_each_sbus(bus) \ 79 - for((bus) = sbus_root; (bus); (bus)=(bus)->next) 80 - 81 - #define for_each_sbusdev(device, bus) \ 82 - for((device) = (bus)->devices; (device); (device)=(device)->next) 83 - 84 - #define for_all_sbusdev(device, bus) \ 85 - for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ 86 - for ((device) = (bus)->devices; (device); (device) = (device)->next) 87 74 88 75 /* These yield IOMMU mappings in consistent mode. */ 89 76 void prom_adjust_ranges(struct linux_prom_ranges *, int,
-13
arch/sparc/include/asm/sbus_64.h
··· 66 66 }; 67 67 #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) 68 68 69 - extern struct sbus_bus *sbus_root; 70 - 71 - /* Device probing routines could find these handy */ 72 - #define for_each_sbus(bus) \ 73 - for((bus) = sbus_root; (bus); (bus)=(bus)->next) 74 - 75 - #define for_each_sbusdev(device, bus) \ 76 - for((device) = (bus)->devices; (device); (device)=(device)->next) 77 - 78 - #define for_all_sbusdev(device, bus) \ 79 - for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ 80 - for ((device) = (bus)->devices; (device); (device) = (device)->next) 81 - 82 69 extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); 83 70 extern int sbus_arch_preinit(void); 84 71 extern void sbus_arch_postinit(void);
-1
arch/sparc/kernel/sparc_ksyms.c
··· 153 153 EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached)); 154 154 155 155 #ifdef CONFIG_SBUS 156 - EXPORT_SYMBOL(sbus_root); 157 156 EXPORT_SYMBOL(sbus_set_sbus64); 158 157 EXPORT_SYMBOL(sbus_iounmap); 159 158 EXPORT_SYMBOL(sbus_ioremap);
-1
arch/sparc64/kernel/sparc64_ksyms.c
··· 160 160 EXPORT_SYMBOL(auxio_set_lte); 161 161 #endif 162 162 #ifdef CONFIG_SBUS 163 - EXPORT_SYMBOL(sbus_root); 164 163 EXPORT_SYMBOL(sbus_set_sbus64); 165 164 #endif 166 165 EXPORT_SYMBOL(outsb);
-14
drivers/sbus/sbus.c
··· 28 28 29 29 static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_sbusobppath_attr, NULL); 30 30 31 - struct sbus_bus *sbus_root; 32 - 33 31 static void __init fill_sbus_device_iommu(struct sbus_dev *sdev) 34 32 { 35 33 struct of_device *op = of_find_device_by_node(sdev->ofdev.node); ··· 76 78 fill_sbus_device_iommu(sdev); 77 79 } 78 80 79 - /* We preserve the "probe order" of these bus and device lists to give 80 - * the same ordering as the old code. 81 - */ 82 - static void __init sbus_insert(struct sbus_bus *sbus, struct sbus_bus **root) 83 - { 84 - while (*root) 85 - root = &(*root)->next; 86 - *root = sbus; 87 - sbus->next = NULL; 88 - } 89 - 90 81 static void __init sdev_insert(struct sbus_dev *sdev, struct sbus_dev **root) 91 82 { 92 83 while (*root) ··· 115 128 if (!sbus) 116 129 return; 117 130 118 - sbus_insert(sbus, &sbus_root); 119 131 sbus->prom_node = dp->node; 120 132 121 133 sbus_setup_iommu(sbus, dp);