Skip to content

Commit

Permalink
Staging: iio: fix ring buffer build
Browse files Browse the repository at this point in the history
max1363 uses both the iio hardware ring buffer and software
ring buffer interfaces, but its Makefile and Kconfig do not
reflect that usage, so its build breaks.  Add a new Kconfig
symbol to reflect that usage and change max1363.h & Makefile
to use the new Kconfig symbol.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 76e4079 commit d5f5d89
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions drivers/staging/iio/adc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ config MAX1363
convertors (ADC). (max1361, max1362, max1363, max1364, max1136,
max1136, max1137, max1138, max1139, max1236, max1237, max11238,
max1239) Provides direct access via sysfs.

config MAX1363_RING_BUFFER
bool "MAXIM max1363: use ring buffer"
depends on MAX1363
select IIO_RING_BUFFER
select IIO_SW_RING
help
Say yes here to include ring buffer support in the MAX1363
ADC driver.
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
#

max1363-y := max1363_core.o
max1363-$(CONFIG_IIO_RING_BUFFER) += max1363_ring.o
max1363-$(CONFIG_MAX1363_RING_BUFFER) += max1363_ring.o

obj-$(CONFIG_MAX1363) += max1363.o
6 changes: 3 additions & 3 deletions drivers/staging/iio/adc/max1363.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ struct max1363_state {
struct iio_trigger *trig;
struct regulator *reg;
};
#ifdef CONFIG_IIO_RING_BUFFER
#ifdef CONFIG_MAX1363_RING_BUFFER

ssize_t max1363_scan_from_ring(struct device *dev,
struct device_attribute *attr,
Expand All @@ -239,7 +239,7 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev);
int max1363_initialize_ring(struct iio_ring_buffer *ring);
void max1363_uninitialize_ring(struct iio_ring_buffer *ring);

#else /* CONFIG_IIO_RING_BUFFER */
#else /* CONFIG_MAX1363_RING_BUFFER */

static inline void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
{
Expand All @@ -265,5 +265,5 @@ max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
};

static inline void max1363_ring_cleanup(struct iio_dev *indio_dev) {};
#endif /* CONFIG_IIO_RING_BUFFER */
#endif /* CONFIG_MAX1363_RING_BUFFER */
#endif /* _MAX1363_H_ */

0 comments on commit d5f5d89

Please sign in to comment.