aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-device.h
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-02-24 13:01:21 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 11:55:32 -0400
commit1dc3bea78b6cd71c2017aa5da076684c049d8b98 (patch)
tree7bbdc2ca8204d48701e2d0b895da217bde49c711 /drivers/firewire/fw-device.h
parent7c1fca336661aaeb70b9094c4b8eaae389027509 (diff)
firewire: refactor fw_unit reference counting
Add wrappers for getting and putting a unit. Remove some line breaks. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire/fw-device.h')
-rw-r--r--drivers/firewire/fw-device.h27
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 78ecd3991b7f..0d771fda86de 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -64,28 +64,24 @@ struct fw_device {
64 struct fw_attribute_group attribute_group; 64 struct fw_attribute_group attribute_group;
65}; 65};
66 66
67static inline struct fw_device * 67static inline struct fw_device *fw_device(struct device *dev)
68fw_device(struct device *dev)
69{ 68{
70 return container_of(dev, struct fw_device, device); 69 return container_of(dev, struct fw_device, device);
71} 70}
72 71
73static inline int 72static inline int fw_device_is_shutdown(struct fw_device *device)
74fw_device_is_shutdown(struct fw_device *device)
75{ 73{
76 return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; 74 return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN;
77} 75}
78 76
79static inline struct fw_device * 77static inline struct fw_device *fw_device_get(struct fw_device *device)
80fw_device_get(struct fw_device *device)
81{ 78{
82 get_device(&device->device); 79 get_device(&device->device);
83 80
84 return device; 81 return device;
85} 82}
86 83
87static inline void 84static inline void fw_device_put(struct fw_device *device)
88fw_device_put(struct fw_device *device)
89{ 85{
90 put_device(&device->device); 86 put_device(&device->device);
91} 87}
@@ -104,12 +100,23 @@ struct fw_unit {
104 struct fw_attribute_group attribute_group; 100 struct fw_attribute_group attribute_group;
105}; 101};
106 102
107static inline struct fw_unit * 103static inline struct fw_unit *fw_unit(struct device *dev)
108fw_unit(struct device *dev)
109{ 104{
110 return container_of(dev, struct fw_unit, device); 105 return container_of(dev, struct fw_unit, device);
111} 106}
112 107
108static inline struct fw_unit *fw_unit_get(struct fw_unit *unit)
109{
110 get_device(&unit->device);
111
112 return unit;
113}
114
115static inline void fw_unit_put(struct fw_unit *unit)
116{
117 put_device(&unit->device);
118}
119
113#define CSR_OFFSET 0x40 120#define CSR_OFFSET 0x40
114#define CSR_LEAF 0x80 121#define CSR_LEAF 0x80
115#define CSR_DIRECTORY 0xc0 122#define CSR_DIRECTORY 0xc0