diff options
Diffstat (limited to 'drivers/w1/w1_family.c')
-rw-r--r-- | drivers/w1/w1_family.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c index 0e32c114f906..a3c95bd6890a 100644 --- a/drivers/w1/w1_family.c +++ b/drivers/w1/w1_family.c | |||
@@ -107,6 +107,12 @@ struct w1_family * w1_family_registered(u8 fid) | |||
107 | return (ret) ? f : NULL; | 107 | return (ret) ? f : NULL; |
108 | } | 108 | } |
109 | 109 | ||
110 | static void __w1_family_put(struct w1_family *f) | ||
111 | { | ||
112 | if (atomic_dec_and_test(&f->refcnt)) | ||
113 | f->need_exit = 1; | ||
114 | } | ||
115 | |||
110 | void w1_family_put(struct w1_family *f) | 116 | void w1_family_put(struct w1_family *f) |
111 | { | 117 | { |
112 | spin_lock(&w1_flock); | 118 | spin_lock(&w1_flock); |
@@ -114,19 +120,14 @@ void w1_family_put(struct w1_family *f) | |||
114 | spin_unlock(&w1_flock); | 120 | spin_unlock(&w1_flock); |
115 | } | 121 | } |
116 | 122 | ||
117 | void __w1_family_put(struct w1_family *f) | 123 | #if 0 |
118 | { | ||
119 | if (atomic_dec_and_test(&f->refcnt)) | ||
120 | f->need_exit = 1; | ||
121 | } | ||
122 | |||
123 | void w1_family_get(struct w1_family *f) | 124 | void w1_family_get(struct w1_family *f) |
124 | { | 125 | { |
125 | spin_lock(&w1_flock); | 126 | spin_lock(&w1_flock); |
126 | __w1_family_get(f); | 127 | __w1_family_get(f); |
127 | spin_unlock(&w1_flock); | 128 | spin_unlock(&w1_flock); |
128 | |||
129 | } | 129 | } |
130 | #endif /* 0 */ | ||
130 | 131 | ||
131 | void __w1_family_get(struct w1_family *f) | 132 | void __w1_family_get(struct w1_family *f) |
132 | { | 133 | { |
@@ -135,8 +136,5 @@ void __w1_family_get(struct w1_family *f) | |||
135 | smp_mb__after_atomic_inc(); | 136 | smp_mb__after_atomic_inc(); |
136 | } | 137 | } |
137 | 138 | ||
138 | EXPORT_SYMBOL(w1_family_get); | ||
139 | EXPORT_SYMBOL(w1_family_put); | ||
140 | EXPORT_SYMBOL(w1_family_registered); | ||
141 | EXPORT_SYMBOL(w1_unregister_family); | 139 | EXPORT_SYMBOL(w1_unregister_family); |
142 | EXPORT_SYMBOL(w1_register_family); | 140 | EXPORT_SYMBOL(w1_register_family); |