diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-09-06 18:49:48 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-09-12 14:48:40 +0200 |
| commit | 18668ff9a3232d5f942a2f7abc1ad67d2760dcdf (patch) | |
| tree | 251594c51144f5993b0975c5fb4ba9f200e5c79f | |
| parent | 928ec5f148e729076e9202e7c78babede628a50c (diff) | |
| download | linux-stable-18668ff9a3232d5f942a2f7abc1ad67d2760dcdf.tar.gz linux-stable-18668ff9a3232d5f942a2f7abc1ad67d2760dcdf.tar.bz2 linux-stable-18668ff9a3232d5f942a2f7abc1ad67d2760dcdf.zip | |
firewire: core: header file cleanup
fw_card_get, fw_card_put, fw_card_release are currently not exported for
use outside the firewire-core. Move their definitions/ declarations
from the subsystem header file to the core header file.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/firewire/core.h | 14 | ||||
| -rw-r--r-- | include/linux/firewire.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index 6052816be353..7ff6e7585152 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h @@ -96,6 +96,20 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset); int fw_compute_block_crc(u32 *block); 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 */ diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 192d1e43c43c..7e1d4dec83e7 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; |