On Wed, 1 Apr 2020 18:57:06 +0200 Lars-Peter Clausen <lars@xxxxxxxxxx> wrote: > The IIO DMA buffer is a DMA buffer implementation. As such it should > include buffer_impl.h rather than buffer.h. > > The include to buffer.h in buffer-dma.h should be buffer_impl.h so it has > access to the struct iio_buffer definition. The code currently only works > because all places that use buffer-dma.h include buffer_impl.h before it. > > The include to buffer.h in industrialio-buffer-dma.c can be removed since > those file does not reference any of buffer consumer functions. > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> Applied. Thanks, Jonathan > --- > Changes since v1: > * Don't remove buffer.h include in buffer-dma.h since it is needed > after all. > --- > drivers/iio/buffer/industrialio-buffer-dma.c | 1 - > include/linux/iio/buffer-dma.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c > index a74bd9c0587c..d348af8b9705 100644 > --- a/drivers/iio/buffer/industrialio-buffer-dma.c > +++ b/drivers/iio/buffer/industrialio-buffer-dma.c > @@ -12,7 +12,6 @@ > #include <linux/mutex.h> > #include <linux/sched.h> > #include <linux/poll.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/buffer_impl.h> > #include <linux/iio/buffer-dma.h> > #include <linux/dma-mapping.h> > diff --git a/include/linux/iio/buffer-dma.h b/include/linux/iio/buffer-dma.h > index 016d8a068353..ff15c61bf319 100644 > --- a/include/linux/iio/buffer-dma.h > +++ b/include/linux/iio/buffer-dma.h > @@ -11,7 +11,7 @@ > #include <linux/kref.h> > #include <linux/spinlock.h> > #include <linux/mutex.h> > -#include <linux/iio/buffer.h> > +#include <linux/iio/buffer_impl.h> > > struct iio_dma_buffer_queue; > struct iio_dma_buffer_ops;
