On Tue, 24 Mar 2020 14:36:17 +0000 "Ardelean, Alexandru" <alexandru.Ardelean@xxxxxxxxxx> wrote: > On Tue, 2020-03-24 at 15:16 +0100, Lars-Peter Clausen wrote: > > [External] > > > > 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 and > > industrialio-buffer-dmaengine.c can be removed since those files don't > > reference any of buffer consumer functions. > > Reviewed-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> > Applied to the togreg branch of iio.git and pushed out as testing. Thanks Jonathan > > > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> > > --- > > drivers/iio/buffer/industrialio-buffer-dma.c | 1 - > > drivers/iio/buffer/industrialio-buffer-dmaengine.c | 1 - > > include/linux/iio/buffer-dma.h | 2 +- > > 3 files changed, 1 insertion(+), 3 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/drivers/iio/buffer/industrialio-buffer-dmaengine.c > > b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > > index b129693af0fd..8b60dff527c8 100644 > > --- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c > > +++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > > @@ -14,7 +14,6 @@ > > > > #include <linux/iio/iio.h> > > #include <linux/iio/sysfs.h> > > -#include <linux/iio/buffer.h> > > #include <linux/iio/buffer_impl.h> > > #include <linux/iio/buffer-dma.h> > > #include <linux/iio/buffer-dmaengine.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;
