diff options
| author | Chris Boot <bootc@bootc.net> | 2012-02-01 22:36:02 +0000 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-05-09 15:25:17 -0700 |
| commit | fc5f80b152896c1ffded2a91d11dcb08ffcffebb (patch) | |
| tree | 4596cd1ee2c896df4259ee2c75ad3b027b6f2469 | |
| parent | 253d92371ca29a470b2bbf91fb9824a9fef05657 (diff) | |
| download | lwn-fc5f80b152896c1ffded2a91d11dcb08ffcffebb.tar.gz lwn-fc5f80b152896c1ffded2a91d11dcb08ffcffebb.zip | |
firewire: Move fw_card kref functions into linux/firewire.h
When writing a firewire driver that doesn't deal with struct fw_device
objects (e.g. it only publishes FireWire units and doesn't subscribe to
them), you likely need to keep referenced to struct fw_card objects so
that you can send messages to other nodes. This patch moves
fw_card_put(), fw_card_get() and fw_card_release() into the public
include/linux/firewire.h header instead of drivers/firewire/core.h, and
adds EXPORT_SYMBOL_GPL(fw_card_release).
The firewire-sbp-target module requires these so it can keep a reference
to the fw_card object in order that it can fetch ORBs to execute and
read/write related data and status information.
Signed-off-by: Chris Boot <bootc@bootc.net>
Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
| -rw-r--r-- | drivers/firewire/core-card.c | 1 | ||||
| -rw-r--r-- | drivers/firewire/core.h | 15 | ||||
| -rw-r--r-- | include/linux/firewire.h | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c index cc595eba7ba9..f5552b362efc 100644 --- a/drivers/firewire/core-card.c +++ b/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/drivers/firewire/core.h b/drivers/firewire/core.h index 9047f5547d98..b5a2f6197053 100644 --- a/drivers/firewire/core.h +++ b/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/include/linux/firewire.h b/include/linux/firewire.h index 46831303b0b9..e83c24af358a 100644 --- a/include/linux/firewire.h +++ b/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; |