lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 36/45] staging: iio: ad5933: switch buffer mode to software
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexandru Ardelean <alexandru.ardelean@analog.com>

    commit 7d2b8e6aaf9ee87910c2337e1c59bb5d3e3ba8c5 upstream.

    Since commit 152a6a884ae1 ("staging:iio:accel:sca3000 move
    to hybrid hard / soft buffer design.")
    the buffer mechanism has changed and the
    INDIO_BUFFER_HARDWARE flag has been unused.

    Since commit 2d6ca60f3284 ("iio: Add a DMAengine framework
    based buffer")
    the INDIO_BUFFER_HARDWARE flag has been re-purposed for
    DMA buffers.

    This driver has lagged behind these changes, and
    in order for buffers to work, the INDIO_BUFFER_SOFTWARE
    needs to be used.

    Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
    Fixes: 2d6ca60f3284 ("iio: Add a DMAengine framework based buffer")
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
    +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
    @@ -648,8 +648,6 @@ static int ad5933_register_ring_funcs_an
    /* Ring buffer functions - here trigger setup related */
    indio_dev->setup_ops = &ad5933_ring_setup_ops;

    - indio_dev->modes |= INDIO_BUFFER_HARDWARE;
    -
    return 0;
    }

    @@ -762,7 +760,7 @@ static int ad5933_probe(struct i2c_clien
    indio_dev->dev.parent = &client->dev;
    indio_dev->info = &ad5933_info;
    indio_dev->name = id->name;
    - indio_dev->modes = INDIO_DIRECT_MODE;
    + indio_dev->modes = (INDIO_BUFFER_SOFTWARE | INDIO_DIRECT_MODE);
    indio_dev->channels = ad5933_channels;
    indio_dev->num_channels = ARRAY_SIZE(ad5933_channels);


    \
     
     \ /
      Last update: 2018-02-23 20:03    [W:4.535 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site