[SPARC64]: isa_{device,bus} --> sparc_isa_{device,bus}

arch/sparc64/kernel/isa.c

@@ -5,14 +5,14 @@
 #include <asm/oplib.h>
 #include <asm/isa.h>
 
-struct isa_bridge *isa_chain;
+struct sparc_isa_bridge *isa_chain;
 
 static void __init fatal_err(const char *reason)
 {
 	prom_printf("ISA: fatal error, %s.\n", reason);
 }
 
-static void __init report_dev(struct isa_device *isa_dev, int child)
+static void __init report_dev(struct sparc_isa_device *isa_dev, int child)
 {
 	if (child)
 		printk(" (%s)", isa_dev->prom_name);
@@ -20,7 +20,7 @@ static void __init report_dev(struct isa_device *isa_dev, int child)
 		printk(" [%s", isa_dev->prom_name);
 }
 
-static void __init isa_dev_get_resource(struct isa_device *isa_dev)
+static void __init isa_dev_get_resource(struct sparc_isa_device *isa_dev)
 {
 	struct linux_prom_registers regs[PROMREG_MAX];
 	unsigned long base, len;
@@ -67,7 +67,7 @@ static struct {
 	{ 0, 0x00 }	/* end of table */
 };
 
-static void __init isa_dev_get_irq(struct isa_device *isa_dev)
+static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev)
 {
 	int irq_prop;
 
@@ -96,7 +96,7 @@ static void __init isa_dev_get_irq(struct isa_device *isa_dev)
 	}
 }
 
-static void __init isa_fill_children(struct isa_device *parent_isa_dev)
+static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev)
 {
 	int node = prom_getchild(parent_isa_dev->prom_node);
 
@@ -105,7 +105,7 @@ static void __init isa_fill_children(struct isa_device *parent_isa_dev)
 
 	printk(" ->");
 	while (node != 0) {
-		struct isa_device *isa_dev;
+		struct sparc_isa_device *isa_dev;
 		int prop_len;
 
 		isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);
@@ -147,12 +147,12 @@ static void __init isa_fill_children(struct isa_device *parent_isa_dev)
 	}
 }
 
-static void __init isa_fill_devices(struct isa_bridge *isa_br)
+static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
 {
 	int node = prom_getchild(isa_br->prom_node);
 
 	while (node != 0) {
-		struct isa_device *isa_dev;
+		struct sparc_isa_device *isa_dev;
 		int prop_len;
 
 		isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);
@@ -168,7 +168,7 @@ static void __init isa_fill_devices(struct isa_bridge *isa_br)
 		if (isa_br->devices == NULL) {
 			isa_br->devices = isa_dev;
 		} else {
-			struct isa_device *tmp = isa_br->devices;
+			struct sparc_isa_device *tmp = isa_br->devices;
 
 			while (tmp->next)
 				tmp = tmp->next;
@@ -220,7 +220,7 @@ void __init isa_init(void)
 	while ((pdev = pci_find_device(vendor, device, pdev)) != NULL) {
 		struct pcidev_cookie *pdev_cookie;
 		struct pci_pbm_info *pbm;
-		struct isa_bridge *isa_br;
+		struct sparc_isa_bridge *isa_br;
 		int prop_len;
 
 		pdev_cookie = pdev->sysdata;
@@ -233,7 +233,7 @@ void __init isa_init(void)
 
 		isa_br = kmalloc(sizeof(*isa_br), GFP_KERNEL);
 		if (!isa_br) {
-			fatal_err("cannot allocate isa_bridge");
+			fatal_err("cannot allocate sparc_isa_bridge");
 			prom_halt();
 		}
 

arch/sparc64/kernel/time.c

@@ -415,7 +415,7 @@ void __init clock_probe(void)
 	struct linux_central *cbus;
 #ifdef CONFIG_PCI
 	struct linux_ebus *ebus = NULL;
-	struct isa_bridge *isa_br = NULL;
+	struct sparc_isa_bridge *isa_br = NULL;
 #endif
 	static int invoked;
 
@@ -547,7 +547,7 @@ void __init clock_probe(void)
 			break;
 		}
 		else if (isa_br != NULL) {
-			struct isa_device *isadev;
+			struct sparc_isa_device *isadev;
 
 try_isa_clock:
 			for_each_isadev(isadev, isa_br)

drivers/char/rtc.c

@@ -807,8 +807,8 @@ static int __init rtc_init(void)
 	struct linux_ebus *ebus;
 	struct linux_ebus_device *edev;
 #ifdef __sparc_v9__
-	struct isa_bridge *isa_br;
-	struct isa_device *isa_dev;
+	struct sparc_isa_bridge *isa_br;
+	struct sparc_isa_device *isa_dev;
 #endif
 #endif
 

drivers/input/misc/sparcspkr.c

@@ -133,7 +133,7 @@ static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int
 	return 0;
 }
 
-static int __init init_isa_beep(struct isa_device *isa_dev)
+static int __init init_isa_beep(struct sparc_isa_device *isa_dev)
 {
 	beep_iobase = isa_dev->resource.start;
 
@@ -155,8 +155,8 @@ static int __init sparcspkr_init(void)
 	struct linux_ebus *ebus;
 	struct linux_ebus_device *edev = NULL;
 #ifdef CONFIG_SPARC64
-	struct isa_bridge *isa_br;
-	struct isa_device *isa_dev;
+	struct sparc_isa_bridge *isa_br;
+	struct sparc_isa_device *isa_dev;
 #endif
 
 	for_each_ebus(ebus) {

drivers/serial/sunsu.c

@@ -1028,8 +1028,8 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
 	struct linux_ebus_device *dev = 0;
 	struct linux_ebus *ebus;
 #ifdef CONFIG_SPARC64
-	struct isa_bridge *isa_br;
-	struct isa_device *isa_dev;
+	struct sparc_isa_bridge *isa_br;
+	struct sparc_isa_device *isa_dev;
 #endif
 #ifndef CONFIG_SPARC64
 	struct linux_prom_registers reg0;

include/asm-sparc64/floppy.h

@@ -540,16 +540,18 @@ static int __init ebus_fdthree_p(struct linux_ebus_device *edev)
 #ifdef ISA_FLOPPY_WORKS
 static unsigned long __init isa_floppy_init(void)
 {
-	struct isa_bridge *isa_br;
-	struct isa_device *isa_dev = NULL;
+	struct sparc_isa_bridge *isa_br;
+	struct sparc_isa_device *isa_dev = NULL;
 
 	for_each_isa(isa_br) {
 		for_each_isadev(isa_dev, isa_br) {
 			if (!strcmp(isa_dev->prom_name, "dma")) {
-				struct isa_device *child = isa_dev->child;
+				struct sparc_isa_device *child =
+					isa_dev->child;
 
 				while (child) {
-					if (!strcmp(child->prom_name, "floppy")) {
+					if (!strcmp(child->prom_name,
+						    "floppy")) {
 						isa_dev = child;
 						goto isa_done;
 					}

include/asm-sparc64/isa.h

@@ -10,10 +10,12 @@
 #include <asm/pbm.h>
 #include <asm/oplib.h>
 
-struct isa_device {
-	struct isa_device	*next;
-	struct isa_device	*child;
-	struct isa_bridge	*bus;
+struct sparc_isa_bridge;
+
+struct sparc_isa_device {
+	struct sparc_isa_device	*next;
+	struct sparc_isa_device	*child;
+	struct sparc_isa_bridge	*bus;
 	int			prom_node;
 	char			prom_name[64];
 	char			compatible[64];
@@ -21,9 +23,9 @@ struct isa_device {
 	unsigned int		irq;
 };
 
-struct isa_bridge {
-	struct isa_bridge	*next;
-	struct isa_device	*devices;
+struct sparc_isa_bridge {
+	struct sparc_isa_bridge	*next;
+	struct sparc_isa_device	*devices;
 	struct pci_pbm_info	*parent;
 	struct pci_dev		*self;
 	int			index;
@@ -34,7 +36,7 @@ struct isa_bridge {
 	int			num_isa_ranges;
 };
 
-extern struct isa_bridge	*isa_chain;
+extern struct sparc_isa_bridge	*isa_chain;
 
 extern void isa_init(void);
 

include/asm-sparc64/parport.h

@@ -80,12 +80,12 @@ static int ebus_ecpp_p(struct linux_ebus_device *edev)
 
 static int parport_isa_probe(int count)
 {
-	struct isa_bridge *isa_br;
-	struct isa_device *isa_dev;
+	struct sparc_isa_bridge *isa_br;
+	struct sparc_isa_device *isa_dev;
 
 	for_each_isa(isa_br) {
 		for_each_isadev(isa_dev, isa_br) {
-			struct isa_device *child;
+			struct sparc_isa_device *child;
 			unsigned long base;
 
 			if (strcmp(isa_dev->prom_name, "dma"))