git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[pandora-kernel.git]
/
drivers
/
staging
/
iio
/
ring_sw.h
diff --git
a/drivers/staging/iio/ring_sw.h
b/drivers/staging/iio/ring_sw.h
index
61f1ed6
..
ad03d83
100644
(file)
--- a/
drivers/staging/iio/ring_sw.h
+++ b/
drivers/staging/iio/ring_sw.h
@@
-121,19
+121,19
@@
int iio_mark_update_needed_sw_rb(struct iio_ring_buffer *r);
/**
/**
- * iio_get_b
pd
_sw_rb() - get the datum size in bytes
+ * iio_get_b
ytes_per_datum
_sw_rb() - get the datum size in bytes
* @r: pointer to a software ring buffer created by an
* iio_create_sw_rb call
**/
* @r: pointer to a software ring buffer created by an
* iio_create_sw_rb call
**/
-int iio_get_b
pd
_sw_rb(struct iio_ring_buffer *r);
+int iio_get_b
ytes_per_datum
_sw_rb(struct iio_ring_buffer *r);
/**
/**
- * iio_set_b
pd
_sw_rb() - set the datum size in bytes
+ * iio_set_b
ytes_per_datum
_sw_rb() - set the datum size in bytes
* @r: pointer to a software ring buffer created by an
* iio_create_sw_rb call
* @bpd: bytes per datum value
**/
* @r: pointer to a software ring buffer created by an
* iio_create_sw_rb call
* @bpd: bytes per datum value
**/
-int iio_set_b
pd
_sw_rb(struct iio_ring_buffer *r, size_t bpd);
+int iio_set_b
ytes_per_datum
_sw_rb(struct iio_ring_buffer *r, size_t bpd);
/**
* iio_get_length_sw_rb() - get how many datums the rb may contain
/**
* iio_get_length_sw_rb() - get how many datums the rb may contain
@@
-166,8
+166,8
@@
static inline void iio_ring_sw_register_funcs(struct iio_ring_access_funcs *ra)
ra->mark_param_change = &iio_mark_update_needed_sw_rb;
ra->request_update = &iio_request_update_sw_rb;
ra->mark_param_change = &iio_mark_update_needed_sw_rb;
ra->request_update = &iio_request_update_sw_rb;
- ra->get_b
pd = &iio_get_bpd
_sw_rb;
- ra->set_b
pd = &iio_set_bpd
_sw_rb;
+ ra->get_b
ytes_per_datum = &iio_get_bytes_per_datum
_sw_rb;
+ ra->set_b
ytes_per_datum = &iio_set_bytes_per_datum
_sw_rb;
ra->get_length = &iio_get_length_sw_rb;
ra->set_length = &iio_set_length_sw_rb;
ra->get_length = &iio_get_length_sw_rb;
ra->set_length = &iio_set_length_sw_rb;