[-mm patch] drivers/firewire/: cleanups

[Adrian Bunk]

On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
>  git-ieee1394.patch
>...
>  git trees
>...


This patch contains the following cleanups:
- "extern inline" -> "static inline"
- fw-topology.c: make struct fw_node_create static

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 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(-)

--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.c.old	2007-01-22 18:27:12.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.c	2007-01-22 18:27:21.000000000 +0100
@@ -92,7 +92,7 @@
 	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;
 
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.c.old	2007-01-22 18:27:45.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.c	2007-01-22 18:27:54.000000000 +0100
@@ -106,7 +106,7 @@
 	}
 }
 
-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)
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.h.old	2007-01-22 18:29:01.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.h	2007-01-22 18:29:13.000000000 +0100
@@ -198,7 +198,7 @@
         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);
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.h.old	2007-01-22 18:29:39.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.h	2007-01-22 18:29:43.000000000 +0100
@@ -57,13 +57,13 @@
         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 @@
 	return node;
 }
 
-extern inline void
+static inline void
 fw_node_put(struct fw_node *node)
 {
 	if (atomic_dec_and_test(&node->ref_count))
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-ohci.c.old	2007-01-22 18:32:58.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-ohci.c	2007-01-22 18:33:02.000000000 +0100
@@ -147,7 +147,7 @@
 	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 @@
 
 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);


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/