summaryrefslogtreecommitdiff
path: root/drivers/w1/slaves/w1_ds2780.h
diff options
context:
space:
mode:
authorClifton Barnes <cabarnes@indesign-llc.com>2011-11-02 13:39:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 16:07:03 -0700
commit9fe678fa2feb4aaac0b4220de63e1b7f8ccebae6 (patch)
tree2960251be84e19f289b1263f018cf33d95da4a95 /drivers/w1/slaves/w1_ds2780.h
parent853eee72f74f449797f0500ea19fc1bf497428d8 (diff)
drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Adds a nolock function to the w1 interface to avoid locking the mutex if needed. Signed-off-by: Clifton Barnes <cabarnes@indesign-llc.com> Cc: Evgeniy Polyakov <zbr@ioremap.net> Cc: <stable@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1/slaves/w1_ds2780.h')
-rw-r--r--drivers/w1/slaves/w1_ds2780.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/w1/slaves/w1_ds2780.h b/drivers/w1/slaves/w1_ds2780.h
index a1fba79eb1b5..737379365021 100644
--- a/drivers/w1/slaves/w1_ds2780.h
+++ b/drivers/w1/slaves/w1_ds2780.h
@@ -124,6 +124,8 @@
extern int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
int io);
+extern int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr,
+ size_t count, int io);
extern int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd);
#endif /* !_W1_DS2780_H */