From patchwork Mon Oct 2 16:37:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 9981015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 98FF260384 for ; Mon, 2 Oct 2017 16:37:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BABF223A1 for ; Mon, 2 Oct 2017 16:37:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8074B284C9; Mon, 2 Oct 2017 16:37:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEDD8223A1 for ; Mon, 2 Oct 2017 16:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751515AbdJBQhq (ORCPT ); Mon, 2 Oct 2017 12:37:46 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55159 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751174AbdJBQhp (ORCPT ); Mon, 2 Oct 2017 12:37:45 -0400 Received: by mail-wm0-f66.google.com with SMTP id i124so11762748wmf.3 for ; Mon, 02 Oct 2017 09:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qxFiiROBEQC5uBcARSYsd6i8zqWBuDQ3kbsY5yevSEs=; b=SjlBYVYN+j5ihsM6ndzLGH9FOWukcBDY/8+detKzBH1JXQ7nXyUBjEdNjv/TYegUj1 55g+sryaadot5oifMni6JOYGeglbFk9OXYPeZQyD1lHDpr+a48H4+ta5ElpWARP3dkSS pYBMXNeCE1juzq518Quo2YJp7c4d/YCyTUlNOnC/ZxTMKEekNuSp31v1g+xsd6GIzS2a zoRti6rIDBk7L7AtRkUIAfjQs5elRRGDv875UuRR18AlZgbaGPJmDbhBfeVehzrtLkeO JdkzjzWUYPUTdCA3v7JXBKxxIjegEPfKkVywxBu+u5Ncz5256rGM0otQYAniniQqMvzU rgrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qxFiiROBEQC5uBcARSYsd6i8zqWBuDQ3kbsY5yevSEs=; b=JJgiZVEVw3JcljVLqQxCZWWjKURqxnWkAwSsuFEZeFCSbcrA2MaMRYnNyRZB64p1KG WAo1Eo2TTmZSDwrq3v1F5pzPlOJPiIfjWSY5EpEe+a4og4dB2mUIeU+SvUpAB4nDBK/M 4FsSJ/d3B+61/q/XVgP1jk2/zmEucjW/fPMaOUdj9b0XgxrYg6RF38vEkxUY3I+mIeFI I1KrzmKxnquwCc/buqcOLOU6kTg4tNlCs1+1uXhN+7f2/JR/O8/nNT49fC5RRDc7+Upi JRksBB6QImtfNQaoXA4b5/Ju9YwPcPOvbKgcui64gFR5cICVdsHfQ6JCoY3ddAldsSC3 ryvA== X-Gm-Message-State: AMCzsaWpMH0sUIM+wgdtzYNw9SBBpYdgHuEcjW0ElkOnJIMg1yfsz0EX SQY5MecqJxtFqlVVyWmXlDI= X-Google-Smtp-Source: AOwi7QBg7QPHVDIthqdwxp5AaeUCovh3fu2vruPg9vuKS0LAYPnKGRwQaUCDsZ0CRjO95w93/FAgnQ== X-Received: by 10.28.174.80 with SMTP id x77mr11868444wme.83.1506962264547; Mon, 02 Oct 2017 09:37:44 -0700 (PDT) Received: from localhost.localdomain ([151.66.56.134]) by smtp.gmail.com with ESMTPSA id m7sm4533734wrb.86.2017.10.02.09.37.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Oct 2017 09:37:43 -0700 (PDT) From: Lorenzo Bianconi X-Google-Original-From: Lorenzo Bianconi To: jic23@kernel.org Cc: linux-iio@vger.kernel.org, lorenzo.bianconi@st.com Subject: [PATCH v2 1/4] iio: imu: st_lsm6dsx: convert max_fifo_size in FIFO sample size Date: Mon, 2 Oct 2017 18:37:37 +0200 Message-Id: <20171002163740.13780-2-lorenzo.bianconi@st.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002163740.13780-1-lorenzo.bianconi@st.com> References: <20171002163740.13780-1-lorenzo.bianconi@st.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Express max fifo depth in ST_LSM6DSX_SAMPLE_SIZE instead of in bytes. That change will be necessary to properly support more devices in st_lsm6dsx driver Signed-off-by: Lorenzo Bianconi --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index debf4064f474..e6e0363cd1c2 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -156,21 +156,21 @@ static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = { static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { { .wai = 0x69, - .max_fifo_size = 8192, + .max_fifo_size = 1365, .id = { [0] = ST_LSM6DS3_ID, }, }, { .wai = 0x69, - .max_fifo_size = 4096, + .max_fifo_size = 682, .id = { [0] = ST_LSM6DS3H_ID, }, }, { .wai = 0x6a, - .max_fifo_size = 4096, + .max_fifo_size = 682, .id = { [0] = ST_LSM6DSL_ID, [1] = ST_LSM6DSM_ID, @@ -462,10 +462,9 @@ static int st_lsm6dsx_set_watermark(struct iio_dev *iio_dev, unsigned int val) { struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev); struct st_lsm6dsx_hw *hw = sensor->hw; - int err, max_fifo_len; + int err; - max_fifo_len = hw->settings->max_fifo_size / ST_LSM6DSX_SAMPLE_SIZE; - if (val < 1 || val > max_fifo_len) + if (val < 1 || val > hw->settings->max_fifo_size) return -EINVAL; err = st_lsm6dsx_update_watermark(sensor, val);