diff options
Diffstat (limited to 'net/irda/iriap.c')
-rw-r--r-- | net/irda/iriap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 8f1c6d65b247..98b0fa965790 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
@@ -79,10 +79,10 @@ static int iriap_data_indication(void *instance, void *sap, | |||
79 | 79 | ||
80 | static void iriap_watchdog_timer_expired(void *data); | 80 | static void iriap_watchdog_timer_expired(void *data); |
81 | 81 | ||
82 | static inline void iriap_start_watchdog_timer(struct iriap_cb *self, | 82 | static inline void iriap_start_watchdog_timer(struct iriap_cb *self, |
83 | int timeout) | 83 | int timeout) |
84 | { | 84 | { |
85 | irda_start_timer(&self->watchdog_timer, timeout, self, | 85 | irda_start_timer(&self->watchdog_timer, timeout, self, |
86 | iriap_watchdog_timer_expired); | 86 | iriap_watchdog_timer_expired); |
87 | } | 87 | } |
88 | 88 | ||
@@ -674,7 +674,7 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self, | |||
674 | if (attrib == NULL) { | 674 | if (attrib == NULL) { |
675 | IRDA_DEBUG(2, "LM-IAS: Attribute %s not found\n", attr); | 675 | IRDA_DEBUG(2, "LM-IAS: Attribute %s not found\n", attr); |
676 | iriap_getvaluebyclass_response(self, obj->id, | 676 | iriap_getvaluebyclass_response(self, obj->id, |
677 | IAS_ATTRIB_UNKNOWN, | 677 | IAS_ATTRIB_UNKNOWN, |
678 | &irias_missing); | 678 | &irias_missing); |
679 | return; | 679 | return; |
680 | } | 680 | } |
@@ -971,7 +971,7 @@ static const char *ias_value_types[] = { | |||
971 | "IAS_STRING" | 971 | "IAS_STRING" |
972 | }; | 972 | }; |
973 | 973 | ||
974 | static inline struct ias_object *irias_seq_idx(loff_t pos) | 974 | static inline struct ias_object *irias_seq_idx(loff_t pos) |
975 | { | 975 | { |
976 | struct ias_object *obj; | 976 | struct ias_object *obj; |
977 | 977 | ||
@@ -980,7 +980,7 @@ static inline struct ias_object *irias_seq_idx(loff_t pos) | |||
980 | if (pos-- == 0) | 980 | if (pos-- == 0) |
981 | break; | 981 | break; |
982 | } | 982 | } |
983 | 983 | ||
984 | return obj; | 984 | return obj; |
985 | } | 985 | } |
986 | 986 | ||
@@ -995,7 +995,7 @@ static void *irias_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
995 | { | 995 | { |
996 | ++*pos; | 996 | ++*pos; |
997 | 997 | ||
998 | return (v == SEQ_START_TOKEN) | 998 | return (v == SEQ_START_TOKEN) |
999 | ? (void *) hashbin_get_first(irias_objects) | 999 | ? (void *) hashbin_get_first(irias_objects) |
1000 | : (void *) hashbin_get_next(irias_objects); | 1000 | : (void *) hashbin_get_next(irias_objects); |
1001 | } | 1001 | } |
@@ -1027,7 +1027,7 @@ static int irias_seq_show(struct seq_file *seq, void *v) | |||
1027 | for (attrib = (struct ias_attrib *) hashbin_get_first(obj->attribs); | 1027 | for (attrib = (struct ias_attrib *) hashbin_get_first(obj->attribs); |
1028 | attrib != NULL; | 1028 | attrib != NULL; |
1029 | attrib = (struct ias_attrib *) hashbin_get_next(obj->attribs)) { | 1029 | attrib = (struct ias_attrib *) hashbin_get_next(obj->attribs)) { |
1030 | 1030 | ||
1031 | IRDA_ASSERT(attrib->magic == IAS_ATTRIB_MAGIC, | 1031 | IRDA_ASSERT(attrib->magic == IAS_ATTRIB_MAGIC, |
1032 | goto outloop; ); | 1032 | goto outloop; ); |
1033 | 1033 | ||
@@ -1046,14 +1046,14 @@ static int irias_seq_show(struct seq_file *seq, void *v) | |||
1046 | attrib->value->t.string); | 1046 | attrib->value->t.string); |
1047 | break; | 1047 | break; |
1048 | case IAS_OCT_SEQ: | 1048 | case IAS_OCT_SEQ: |
1049 | seq_printf(seq, "octet sequence (%d bytes)\n", | 1049 | seq_printf(seq, "octet sequence (%d bytes)\n", |
1050 | attrib->value->len); | 1050 | attrib->value->len); |
1051 | break; | 1051 | break; |
1052 | case IAS_MISSING: | 1052 | case IAS_MISSING: |
1053 | seq_puts(seq, "missing\n"); | 1053 | seq_puts(seq, "missing\n"); |
1054 | break; | 1054 | break; |
1055 | default: | 1055 | default: |
1056 | seq_printf(seq, "type %d?\n", | 1056 | seq_printf(seq, "type %d?\n", |
1057 | attrib->value->type); | 1057 | attrib->value->type); |
1058 | } | 1058 | } |
1059 | seq_putc(seq, '\n'); | 1059 | seq_putc(seq, '\n'); |