diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 17:35:44 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 17:35:44 +0200 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /drivers/w1/w1_family.c | |
| parent | [MTD] Initialize 'writesize' (diff) | |
| parent | [PATCH] uclinux: use PER_LINUX_32BIT in binfmt_flat (diff) | |
| download | linux-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz linux-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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) return (ret) ? f : NULL; } +static void __w1_family_put(struct w1_family *f) +{ + if (atomic_dec_and_test(&f->refcnt)) + f->need_exit = 1; +} + void w1_family_put(struct w1_family *f) { spin_lock(&w1_flock); @@ -114,19 +120,14 @@ void w1_family_put(struct w1_family *f) spin_unlock(&w1_flock); } -void __w1_family_put(struct w1_family *f) -{ - if (atomic_dec_and_test(&f->refcnt)) - f->need_exit = 1; -} - +#if 0 void w1_family_get(struct w1_family *f) { spin_lock(&w1_flock); __w1_family_get(f); spin_unlock(&w1_flock); - } +#endif /* 0 */ void __w1_family_get(struct w1_family *f) { @@ -135,8 +136,5 @@ void __w1_family_get(struct w1_family *f) smp_mb__after_atomic_inc(); } -EXPORT_SYMBOL(w1_family_get); -EXPORT_SYMBOL(w1_family_put); -EXPORT_SYMBOL(w1_family_registered); EXPORT_SYMBOL(w1_unregister_family); EXPORT_SYMBOL(w1_register_family); |