patch-2.4.20 linux-2.4.20/arch/mips/sgi-ip22/ip22-gio.c
Next file: linux-2.4.20/arch/mips/sgi-ip22/ip22-int.c
Previous file: linux-2.4.20/arch/mips/sgi-ip22/ip22-eisa.c
Back to the patch index
Back to the overall index
- Lines: 78
- Date:
Thu Nov 28 15:53:10 2002
- Orig file:
linux-2.4.19/arch/mips/sgi-ip22/ip22-gio.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips/sgi-ip22/ip22-gio.c linux-2.4.20/arch/mips/sgi-ip22/ip22-gio.c
@@ -1,6 +1,6 @@
-/*
+/*
* ip22-gio.c: Support for GIO64 bus (inspired by PCI code)
- *
+ *
* Copyright (C) 2002 Ladislav Michl
*/
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/proc_fs.h>
+#include <asm/addrspace.h>
#include <asm/sgi/sgimc.h>
#include <asm/sgi/sgigio.h>
@@ -67,7 +68,7 @@
{
int i;
char *p = buf;
-
+
p += sprintf(p, "GIO devices found:\n");
for (i = 0; i < GIO_NUM_SLOTS; i++) {
if (gio_slot[i].flags & GIO_NO_DEVICE)
@@ -77,7 +78,7 @@
p += sprintf(p, " BaseAddr 0x%08lx, MapSize 0x%08x\n",
gio_slot[i].base_addr, gio_slot[i].map_size);
}
-
+
return p - buf;
}
@@ -92,7 +93,7 @@
* @from: Previous GIO device found in search, or %NULL for new search.
*
* Iterates through the list of known GIO devices. If a GIO device is found
- * with a matching @device, a pointer to its device structure is returned.
+ * with a matching @device, a pointer to its device structure is returned.
* Otherwise, %NULL is returned.
* A new search is initiated by passing %NULL to the @from argument.
* Otherwise if @from is not %NULL, searches continue from next device.
@@ -101,12 +102,12 @@
gio_find_device(unsigned char device, const struct gio_dev *from)
{
int i;
-
+
for (i = (from) ? from->slot_number : 0; i < GIO_NUM_SLOTS; i++)
- if (!(gio_slot[i].flags & GIO_NO_DEVICE) &&
+ if (!(gio_slot[i].flags & GIO_NO_DEVICE) &&
(device == GIO_ANY_ID || device == gio_slot[i].device))
return &gio_slot[i];
-
+
return NULL;
}
@@ -119,7 +120,7 @@
extern int ip22_baddr(unsigned int *val, unsigned long addr);
-/**
+/**
* sgigio_init - scan the GIO space and figure out what hardware is actually
* present.
*/
@@ -146,7 +147,7 @@
printk("GIO: Card 0x%02x @ 0x%08lx\n", gio_slot[i].device,
gio_slot[i].base_addr);
}
-
+
if (!found)
printk("GIO: No GIO cards present.\n");
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)