aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-ohci.c8
-rw-r--r--drivers/firewire/fw-topology.c2
-rw-r--r--drivers/firewire/fw-topology.h6
-rw-r--r--drivers/firewire/fw-transaction.c2
-rw-r--r--drivers/firewire/fw-transaction.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index d3750a2692e9..6eff7996c1a7 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -147,7 +147,7 @@ struct fw_ohci {
147 struct iso_context *ir_context_list; 147 struct iso_context *ir_context_list;
148}; 148};
149 149
150extern inline struct fw_ohci *fw_ohci(struct fw_card *card) 150static inline struct fw_ohci *fw_ohci(struct fw_card *card)
151{ 151{
152 return container_of(card, struct fw_ohci, card); 152 return container_of(card, struct fw_ohci, card);
153} 153}
@@ -174,17 +174,17 @@ extern inline struct fw_ohci *fw_ohci(struct fw_card *card)
174 174
175static char ohci_driver_name[] = KBUILD_MODNAME; 175static char ohci_driver_name[] = KBUILD_MODNAME;
176 176
177extern inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data) 177static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
178{ 178{
179 writel(data, ohci->registers + offset); 179 writel(data, ohci->registers + offset);
180} 180}
181 181
182extern inline u32 reg_read(const struct fw_ohci *ohci, int offset) 182static inline u32 reg_read(const struct fw_ohci *ohci, int offset)
183{ 183{
184 return readl(ohci->registers + offset); 184 return readl(ohci->registers + offset);
185} 185}
186 186
187extern inline void flush_writes(const struct fw_ohci *ohci) 187static inline void flush_writes(const struct fw_ohci *ohci)
188{ 188{
189 /* Do a dummy read to flush writes. */ 189 /* Do a dummy read to flush writes. */
190 reg_read(ohci, OHCI1394_Version); 190 reg_read(ohci, OHCI1394_Version);
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index e475025aae91..e111687f5598 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -92,7 +92,7 @@ static int get_port_type(u32 *sid, int port_index)
92 return (sid[index] >> shift) & 0x03; 92 return (sid[index] >> shift) & 0x03;
93} 93}
94 94
95struct fw_node *fw_node_create(u32 sid, int port_count, int color) 95static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
96{ 96{
97 struct fw_node *node; 97 struct fw_node *node;
98 98
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index 32ea7cdb9e11..a78c9516ed0f 100644
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -57,13 +57,13 @@ struct fw_node {
57 struct fw_port ports[0]; 57 struct fw_port ports[0];
58}; 58};
59 59
60extern inline struct fw_node * 60static inline struct fw_node *
61fw_node(struct list_head *l) 61fw_node(struct list_head *l)
62{ 62{
63 return list_entry (l, struct fw_node, link); 63 return list_entry (l, struct fw_node, link);
64} 64}
65 65
66extern inline struct fw_node * 66static inline struct fw_node *
67fw_node_get(struct fw_node *node) 67fw_node_get(struct fw_node *node)
68{ 68{
69 atomic_inc(&node->ref_count); 69 atomic_inc(&node->ref_count);
@@ -71,7 +71,7 @@ fw_node_get(struct fw_node *node)
71 return node; 71 return node;
72} 72}
73 73
74extern inline void 74static inline void
75fw_node_put(struct fw_node *node) 75fw_node_put(struct fw_node *node)
76{ 76{
77 if (atomic_dec_and_test(&node->ref_count)) 77 if (atomic_dec_and_test(&node->ref_count))
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index a72f50288c0a..c2473a824316 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -106,7 +106,7 @@ transmit_complete_callback(struct fw_packet *packet,
106 } 106 }
107} 107}
108 108
109void 109static void
110fw_fill_packet(struct fw_packet *packet, int tcode, int tlabel, 110fw_fill_packet(struct fw_packet *packet, int tcode, int tlabel,
111 int node_id, int generation, int speed, 111 int node_id, int generation, int speed,
112 unsigned long long offset, void *payload, size_t length) 112 unsigned long long offset, void *payload, size_t length)
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 2f849c813a4c..a664fc3380c6 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -198,7 +198,7 @@ struct fw_transaction {
198 void *callback_data; 198 void *callback_data;
199}; 199};
200 200
201extern inline struct fw_packet * 201static inline struct fw_packet *
202fw_packet(struct list_head *l) 202fw_packet(struct list_head *l)
203{ 203{
204 return list_entry (l, struct fw_packet, link); 204 return list_entry (l, struct fw_packet, link);