From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out-198.synserver.de ([212.40.185.198]:1090 "EHLO smtp-out-190.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752128AbbJBOpu (ORCPT ); Fri, 2 Oct 2015 10:45:50 -0400 From: Lars-Peter Clausen To: Jonathan Cameron , Hartmut Knaack , Peter Meerwald Cc: Octavian Purdila , Andrey Yurovsky , linux-iio@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH 2/7] iio:iio_buffer_init(): Only set watermark if not already set Date: Fri, 2 Oct 2015 16:45:02 +0200 Message-Id: <1443797107-13391-3-git-send-email-lars@metafoo.de> In-Reply-To: <1443797107-13391-1-git-send-email-lars@metafoo.de> References: <1443797107-13391-1-git-send-email-lars@metafoo.de> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org Only initialize the watermark field if it is still 0. This allows drivers to provide a custom default watermark value. E.g. some driver might have a fixed watermark or can only support watermarks within a certain range and the initial value for the watermark should be within this range. Signed-off-by: Lars-Peter Clausen --- drivers/iio/industrialio-buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 7340922..5f2c8c8 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -193,7 +193,8 @@ void iio_buffer_init(struct iio_buffer *buffer) INIT_LIST_HEAD(&buffer->buffer_list); init_waitqueue_head(&buffer->pollq); kref_init(&buffer->ref); - buffer->watermark = 1; + if (!buffer->watermark) + buffer->watermark = 1; } EXPORT_SYMBOL(iio_buffer_init); -- 2.1.4