Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=95688e97cdf7453cde22eaa73cc2ab6b113c1853
Commit: 95688e97cdf7453cde22eaa73cc2ab6b113c1853
Parent: 21ebcd1224d05c8673053e1e93ab9ec7ef3e0b84
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 22 19:17:37 2007 +0100
Committer: Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 22:02:40 2007 +0100
firewire: cleanups
This patch contains the following cleanups:
- "extern inline" -> "static inline"
- fw-topology.c: make struct fw_node_create static
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
drivers/firewire/fw-ohci.c | 8 ++++----
drivers/firewire/fw-topology.c | 2 +-
drivers/firewire/fw-topology.h | 6 +++---
drivers/firewire/fw-transaction.c | 2 +-
drivers/firewire/fw-transaction.h | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index d3750a2..6eff799 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -147,7 +147,7 @@ struct fw_ohci {
struct iso_context *ir_context_list;
};
-extern inline struct fw_ohci *fw_ohci(struct fw_card *card)
+static inline struct fw_ohci *fw_ohci(struct fw_card *card)
{
return container_of(card, struct fw_ohci, card);
}
@@ -174,17 +174,17 @@ extern inline struct fw_ohci *fw_ohci(struct fw_card
*card)
static char ohci_driver_name[] = KBUILD_MODNAME;
-extern inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
+static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
{
writel(data, ohci->registers + offset);
}
-extern inline u32 reg_read(const struct fw_ohci *ohci, int offset)
+static inline u32 reg_read(const struct fw_ohci *ohci, int offset)
{
return readl(ohci->registers + offset);
}
-extern inline void flush_writes(const struct fw_ohci *ohci)
+static inline void flush_writes(const struct fw_ohci *ohci)
{
/* Do a dummy read to flush writes. */
reg_read(ohci, OHCI1394_Version);
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index e475025..e111687 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)
return (sid[index] >> shift) & 0x03;
}
-struct fw_node *fw_node_create(u32 sid, int port_count, int color)
+static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
{
struct fw_node *node;
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index 32ea7cd..a78c951 100644
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -57,13 +57,13 @@ struct fw_node {
struct fw_port ports[0];
};
-extern inline struct fw_node *
+static inline struct fw_node *
fw_node(struct list_head *l)
{
return list_entry (l, struct fw_node, link);
}
-extern inline struct fw_node *
+static inline struct fw_node *
fw_node_get(struct fw_node *node)
{
atomic_inc(&node->ref_count);
@@ -71,7 +71,7 @@ fw_node_get(struct fw_node *node)
return node;
}
-extern inline void
+static inline void
fw_node_put(struct fw_node *node)
{
if (atomic_dec_and_test(&node->ref_count))
diff --git a/drivers/firewire/fw-transaction.c
b/drivers/firewire/fw-transaction.c
index a72f502..c2473a8 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -106,7 +106,7 @@ transmit_complete_callback(struct fw_packet *packet,
}
}
-void
+static void
fw_fill_packet(struct fw_packet *packet, int tcode, int tlabel,
int node_id, int generation, int speed,
unsigned long long offset, void *payload, size_t length)
diff --git a/drivers/firewire/fw-transaction.h
b/drivers/firewire/fw-transaction.h
index 2f849c8..a664fc3 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -198,7 +198,7 @@ struct fw_transaction {
void *callback_data;
};
-extern inline struct fw_packet *
+static inline struct fw_packet *
fw_packet(struct list_head *l)
{
return list_entry (l, struct fw_packet, link);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
