---

yaml --- r: 305909 b: refs/heads/master c: fc5f80b h: refs/heads/master i: 305907: 260a856 v: v3
git-mirror · May 9, 2012 · cb8489d · cb8489d
1 parent d2f1975
commit cb8489d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253d92371ca29a470b2bbf91fb9824a9fef05657
+refs/heads/master: fc5f80b152896c1ffded2a91d11dcb08ffcffebb
diff --git a/trunk/drivers/firewire/core-card.c b/trunk/drivers/firewire/core-card.c
@@ -676,6 +676,7 @@ void fw_card_release(struct kref *kref)
 
 	complete(&card->done);
 }
+EXPORT_SYMBOL_GPL(fw_card_release);
 
 void fw_core_remove_card(struct fw_card *card)
 {

diff --git a/trunk/drivers/firewire/core.h b/trunk/drivers/firewire/core.h
@@ -120,21 +120,6 @@ int fw_compute_block_crc(__be32 *block);
 void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset);
 void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
 
-static inline struct fw_card *fw_card_get(struct fw_card *card)
-{
-	kref_get(&card->kref);
-
-	return card;
-}
-
-void fw_card_release(struct kref *kref);
-
-static inline void fw_card_put(struct fw_card *card)
-{
-	kref_put(&card->kref, fw_card_release);
-}
-
-
 /* -cdev */
 
 extern const struct file_operations fw_device_ops;

diff --git a/trunk/include/linux/firewire.h b/trunk/include/linux/firewire.h
@@ -135,6 +135,20 @@ struct fw_card {
 	__be32 maint_utility_register;
 };
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+	kref_get(&card->kref);
+
+	return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+	kref_put(&card->kref, fw_card_release);
+}
+
 struct fw_attribute_group {
 	struct attribute_group *groups[2];
 	struct attribute_group group;
-Original file line number
+Diff line change
@@ Expand Up / @@ -676,6 +676,7 @@ void fw_card_release(struct kref *kref) @@
     	complete(&card->done);
     }
+    EXPORT_SYMBOL_GPL(fw_card_release);
     void fw_core_remove_card(struct fw_card *card)
     {
@@ Expand Down @@