upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / message / i2o / i2o_proc.c

diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index a535c7a..e02ea8f 100644 (file)
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -290,7 +290,7 @@ static char *bus_strings[] = {
        "CARDBUS"
 };
 
-int i2o_seq_show_hrt(struct seq_file *seq, void *v)
+static int i2o_seq_show_hrt(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        i2o_hrt *hrt = (i2o_hrt *) c->hrt.virt;
@@ -391,7 +391,7 @@ int i2o_seq_show_hrt(struct seq_file *seq, void *v)
        return 0;
 }
 
-int i2o_seq_show_lct(struct seq_file *seq, void *v)
+static int i2o_seq_show_lct(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        i2o_lct *lct = (i2o_lct *) c->lct;
@@ -521,7 +521,7 @@ int i2o_seq_show_lct(struct seq_file *seq, void *v)
        return 0;
 }
 
-int i2o_seq_show_status(struct seq_file *seq, void *v)
+static int i2o_seq_show_status(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        char prodstr[25];
@@ -718,7 +718,7 @@ int i2o_seq_show_status(struct seq_file *seq, void *v)
        return 0;
 }
 
-int i2o_seq_show_hw(struct seq_file *seq, void *v)
+static int i2o_seq_show_hw(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        static u32 work32[5];
@@ -775,7 +775,7 @@ int i2o_seq_show_hw(struct seq_file *seq, void *v)
 }
 
 /* Executive group 0003h - Executing DDM List (table) */
-int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
+static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        int token;
@@ -851,7 +851,7 @@ int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
 }
 
 /* Executive group 0004h - Driver Store (scalar) */
-int i2o_seq_show_driver_store(struct seq_file *seq, void *v)
+static int i2o_seq_show_driver_store(struct seq_file *seq, void *v)
 {
        struct i2o_controller *c = (struct i2o_controller *)seq->private;
        u32 work32[8];
@@ -874,7 +874,7 @@ int i2o_seq_show_driver_store(struct seq_file *seq, void *v)
 }
 
 /* Executive group 0005h - Driver Store Table (table) */
-int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
+static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 {
        typedef struct _i2o_driver_store {
                u16 stored_ddm_index;
@@ -938,11 +938,6 @@ int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
                        seq_printf(seq, "                ");
                }
 
-#if 0
-               if (c->i2oversion == 0x02)
-                       seq_printf(seq, "%-d", dst->module_state);
-#endif
-
                seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
                seq_printf(seq, "%-#8x", dst->module_id);
                seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
@@ -950,10 +945,6 @@ int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
                seq_printf(seq, "%8d ", dst->module_size);
                seq_printf(seq, "%8d ", dst->mpb_size);
                seq_printf(seq, "0x%04x", dst->module_flags);
-#if 0
-               if (c->i2oversion == 0x02)
-                       seq_printf(seq, "%d", dst->notification_level);
-#endif
                seq_printf(seq, "\n");
        }
 
@@ -962,7 +953,7 @@ int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 }
 
 /* Generic group F000h - Params Descriptor (table) */
-int i2o_seq_show_groups(struct seq_file *seq, void *v)
+static int i2o_seq_show_groups(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1038,7 +1029,7 @@ int i2o_seq_show_groups(struct seq_file *seq, void *v)
 }
 
 /* Generic group F001h - Physical Device Table (table) */
-int i2o_seq_show_phys_device(struct seq_file *seq, void *v)
+static int i2o_seq_show_phys_device(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1079,7 +1070,7 @@ int i2o_seq_show_phys_device(struct seq_file *seq, void *v)
 }
 
 /* Generic group F002h - Claimed Table (table) */
-int i2o_seq_show_claimed(struct seq_file *seq, void *v)
+static int i2o_seq_show_claimed(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1119,7 +1110,7 @@ int i2o_seq_show_claimed(struct seq_file *seq, void *v)
 }
 
 /* Generic group F003h - User Table (table) */
-int i2o_seq_show_users(struct seq_file *seq, void *v)
+static int i2o_seq_show_users(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1173,7 +1164,7 @@ int i2o_seq_show_users(struct seq_file *seq, void *v)
 }
 
 /* Generic group F005h - Private message extensions (table) (optional) */
-int i2o_seq_show_priv_msgs(struct seq_file *seq, void *v)
+static int i2o_seq_show_priv_msgs(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1222,7 +1213,7 @@ int i2o_seq_show_priv_msgs(struct seq_file *seq, void *v)
 }
 
 /* Generic group F006h - Authorized User Table (table) */
-int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
+static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1263,7 +1254,7 @@ int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
 }
 
 /* Generic group F100h - Device Identity (scalar) */
-int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
@@ -1301,7 +1292,7 @@ int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
        return 0;
 }
 
-int i2o_seq_show_dev_name(struct seq_file *seq, void *v)
+static int i2o_seq_show_dev_name(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
 
@@ -1311,7 +1302,7 @@ int i2o_seq_show_dev_name(struct seq_file *seq, void *v)
 }
 
 /* Generic group F101h - DDM Identity (scalar) */
-int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
+static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1348,7 +1339,7 @@ int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
 }
 
 /* Generic group F102h - User Information (scalar) */
-int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;
@@ -1380,7 +1371,7 @@ int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
 }
 
 /* Generic group F103h - SGL Operating Limits (scalar) */
-int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
+static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        static u32 work32[12];
@@ -1427,7 +1418,7 @@ int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
 }
 
 /* Generic group F200h - Sensors (scalar) */
-int i2o_seq_show_sensors(struct seq_file *seq, void *v)
+static int i2o_seq_show_sensors(struct seq_file *seq, void *v)
 {
        struct i2o_device *d = (struct i2o_device *)seq->private;
        int token;