aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 09:43:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 09:43:22 -0700
commitff830b8e5f999d1ccbd0282a666520f0b557daa4 (patch)
tree5979aba5ed48c93d658a208f3a1f714e9e1e8b67 /include
parent746942d06acdb4dd78d16baa5f3728a48a033bdd (diff)
parent625f0850a8e27b6a8d6fdb95056f35bc22d92b55 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: remove a workaround for Momobay FX-3A firewire: sbp2: remove a workaround for Momobay FX-3A firewire: sbp2: fix status reception firewire: core: fix topology map response handler firewire: core: fix race with parallel PCI device probe firewire: core: header file cleanup firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow) ieee1394: raw1394: Do not leak memory on failed trylock.
Diffstat (limited to 'include')
-rw-r--r--include/linux/firewire.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 192d1e43c43..7e1d4dec83e 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -134,20 +134,6 @@ struct fw_card {
u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
};
-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;