Commit 98261dd1 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 10436481

arch/sparc/include/asm/sbus_32.h

+0 −13
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ struct sbus_bus { 
};

#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)



extern struct sbus_bus *sbus_root;



static inline int

sbus_is_slave(struct sbus_dev *dev)

{
@@ -74,17 +72,6 @@ sbus_is_slave(struct sbus_dev *dev) 
	return 0;

}



/* Device probing routines could find these handy */

#define for_each_sbus(bus) \

        for((bus) = sbus_root; (bus); (bus)=(bus)->next)



#define for_each_sbusdev(device, bus) \

        for((device) = (bus)->devices; (device); (device)=(device)->next)



#define for_all_sbusdev(device, bus) \

	for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \

		for ((device) = (bus)->devices; (device); (device) = (device)->next)



/* These yield IOMMU mappings in consistent mode. */

void prom_adjust_ranges(struct linux_prom_ranges *, int,

			struct linux_prom_ranges *, int);

arch/sparc/include/asm/sbus_64.h

+0 −13
Original line number Diff line number Diff line
@@ -66,19 +66,6 @@ struct sbus_bus { 
};

#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)



extern struct sbus_bus *sbus_root;



/* Device probing routines could find these handy */

#define for_each_sbus(bus) \

        for((bus) = sbus_root; (bus); (bus)=(bus)->next)



#define for_each_sbusdev(device, bus) \

        for((device) = (bus)->devices; (device); (device)=(device)->next)



#define for_all_sbusdev(device, bus) \

	for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \

		for ((device) = (bus)->devices; (device); (device) = (device)->next)



extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);

extern int sbus_arch_preinit(void);

extern void sbus_arch_postinit(void);

arch/sparc/kernel/sparc_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_one)); 
EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached));



#ifdef CONFIG_SBUS

EXPORT_SYMBOL(sbus_root);

EXPORT_SYMBOL(sbus_set_sbus64);

EXPORT_SYMBOL(sbus_iounmap);

EXPORT_SYMBOL(sbus_ioremap);

arch/sparc64/kernel/sparc64_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ EXPORT_SYMBOL(auxio_set_led); 
EXPORT_SYMBOL(auxio_set_lte);

#endif

#ifdef CONFIG_SBUS

EXPORT_SYMBOL(sbus_root);

EXPORT_SYMBOL(sbus_set_sbus64);

#endif

EXPORT_SYMBOL(outsb);

drivers/sbus/sbus.c

+0 −14
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ show_sbusobppath_attr(struct device * dev, struct device_attribute * attr, char 


static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_sbusobppath_attr, NULL);



struct sbus_bus *sbus_root;



static void __init fill_sbus_device_iommu(struct sbus_dev *sdev)

{

	struct of_device *op = of_find_device_by_node(sdev->ofdev.node);
@@ -78,17 +76,6 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde 
	fill_sbus_device_iommu(sdev);

}



/* We preserve the "probe order" of these bus and device lists to give

 * the same ordering as the old code.

 */

static void __init sbus_insert(struct sbus_bus *sbus, struct sbus_bus **root)

{

	while (*root)

		root = &(*root)->next;

	*root = sbus;

	sbus->next = NULL;

}



static void __init sdev_insert(struct sbus_dev *sdev, struct sbus_dev **root)

{

	while (*root)
@@ -128,7 +115,6 @@ static void __init build_one_sbus(struct device_node *dp, int num_sbus) 
	if (!sbus)

		return;



	sbus_insert(sbus, &sbus_root);

	sbus->prom_node = dp->node;



	sbus_setup_iommu(sbus, dp);