nubus: Rename struct nubus_dev

It is misleading to call a functional resource a "device". In adopting
the Linux Driver Model, the struct device will be embedded in struct
nubus_board. That will compound the terminlogy problem because drivers
will bind with boards, not with functional resources. Avoid this by
renaming struct nubus_dev as struct nubus_rsrc. "Functional resource"
is the vendor's terminology so this helps avoid confusion.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index f47d90924ab4..f2b118330be0 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -36,17 +36,14 @@
 static int
 nubus_devices_proc_show(struct seq_file *m, void *v)
 {
-        struct nubus_dev *dev = nubus_devices;
+        struct nubus_rsrc *fres = nubus_func_rsrcs;
 
-        while (dev) {
+        while (fres) {
                 seq_printf(m, "%x\t%04x %04x %04x %04x",
-                              dev->board->slot,
-                              dev->category,
-                              dev->type,
-                              dev->dr_sw,
-                              dev->dr_hw);
-                seq_printf(m, "\t%08lx\n", dev->board->slot_addr);
-                dev = dev->next;
+                           fres->board->slot, fres->category, fres->type,
+                           fres->dr_sw, fres->dr_hw);
+                seq_printf(m, "\t%08lx\n", fres->board->slot_addr);
+                fres = fres->next;
         }
         return 0;
 }