From patchwork Mon Apr 20 20:40:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11499821 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A90515AB for ; Mon, 20 Apr 2020 20:40:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1233B20857 for ; Mon, 20 Apr 2020 20:40:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H16wjBCU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726055AbgDTUka (ORCPT ); Mon, 20 Apr 2020 16:40:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725774AbgDTUka (ORCPT ); Mon, 20 Apr 2020 16:40:30 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5963C061A0C for ; Mon, 20 Apr 2020 13:40:29 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id z26so11555982ljz.11 for ; Mon, 20 Apr 2020 13:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N8hZ33Ib2VrL63s5ftZNUenxJncMIHHQLe/XqYyzmzI=; b=H16wjBCUBkg/a/dNB/Ys7k9h2VUrW1iJOi+qUwh4Kfd3PbppfsCulmr/vXKHHemGBK S+Ri5Q8FD+VuJWHhUQ1bD7tYFFYZF4aEsde3S7/bnXle2Hhud2vlSl5+MZ6+1DvbrzKs qdH1taEtBw8Svr5lZYw98mPk5pcGe4ArKL/xxibfXwGq5BHW4KyarWGZBNiYjZz9HN7d qboTZ10gCS+ZXn7hcpphgyMYAv3+0UREY4tFAhmyZ1t8uwrDPiFgibvYaXKn+4aFdRdW SLMGPR/uL+oseyYHQspFiE5jAzrMpGxkvvOUUqjg6V7Pqv1RC1T+0uGLOMCHtsrylcUC YnDw== 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:mime-version:content-transfer-encoding; bh=N8hZ33Ib2VrL63s5ftZNUenxJncMIHHQLe/XqYyzmzI=; b=TwR9LqCVJFRiMpBlWNSyhCSsRwIGHd541AZL8BbjhHFueSfvY4CtlXc+fmGSpqRUGH 84K0AwEucJJ09mJWVrrlFmldVQdJkeHpIvmyhyqmLnYpXIRjPtT/R4CGd+ZzZzXSsVkv f5mQwaCDksnWq6J+2PlpaIRJ0cw4XOtjwzl7Uhjj3Q0ljVPNMVw6nrwqsE6ay/CSXb4R kjDyPplN6ycSKGrgSjWMW6sYOuHhpPKlRGCpYvqPmsW6iWAqdRqc254l+P5joIKyfSew QsruZCzPfNOHEZP9Tc12eLC1O/XLRyPSohnNVEC2mDkJrItxh1VofscaKvsxfHqTZtXK M36Q== X-Gm-Message-State: AGi0PuZhw/BFHrR2GMwodswBbnW3P4OgjkeOruAdoRAmIx1/RKc+9qcu MMS3NBlhrEKuOuXiFCXJfkHexA== X-Google-Smtp-Source: APiQypJG5gX8CWPFe3FcHCUFncJiQGKBMWb1Ts8VqTLrLqpnreTvQ6C57m4MdtCC0uNv5XzwgVggcA== X-Received: by 2002:a2e:740c:: with SMTP id p12mr10932112ljc.11.1587415228061; Mon, 20 Apr 2020 13:40:28 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-f3d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.243]) by smtp.gmail.com with ESMTPSA id y22sm336637lfg.92.2020.04.20.13.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 13:40:27 -0700 (PDT) From: Linus Walleij To: Jonathan Cameron , linux-iio@vger.kernel.org Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , linux-input@vger.kernel.org, Linus Walleij , Nick Reitemeyer , Stephan Gerhold , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 2/3 v4] iio: magnetometer: ak8974: Break out measurement Date: Mon, 20 Apr 2020 22:40:21 +0200 Message-Id: <20200420204022.18235-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200420204022.18235-1-linus.walleij@linaro.org> References: <20200420204022.18235-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This breaks out the measurement code to its own function so we can handle this without swirling it up with the big switch() statement inside ak8974_read_raw(). Keep a local s16 helper variable for the signed value coming out of the measurement before assigning it to the integer *val. The local variable makes the code easier to read and the compiler will optimize it if possible. Cc: Nick Reitemeyer Cc: Stephan Gerhold Reviewed-by: Michał Mirosław Signed-off-by: Linus Walleij --- ChangeLog v3->v4: - Assign the casted s16 to the int *val. - Collect Michał's review tag. ChangeLog v2->v3: - Return directly from the raw read function, we need no goto:s as we got rid of the lock. - Change the measurement function to return an int * after measurement and just pass *val to the function saving a local variable. - Insert a comment explaining the explicit cast to (s16). - Rename function as ak8974_measure_channel() so the name states exactly what is going on. - Break out as a separate patch. --- drivers/iio/magnetometer/ak8974.c | 66 +++++++++++++++++++------------ 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c index 7d585c3b7e1e..fb6d84b79a7a 100644 --- a/drivers/iio/magnetometer/ak8974.c +++ b/drivers/iio/magnetometer/ak8974.c @@ -554,47 +554,61 @@ static int ak8974_detect(struct ak8974 *ak8974) return 0; } +static int ak8974_measure_channel(struct ak8974 *ak8974, unsigned long address, + int *val) +{ + __le16 hw_values[3]; + int ret; + + pm_runtime_get_sync(&ak8974->i2c->dev); + mutex_lock(&ak8974->lock); + + /* + * We read all axes and discard all but one, for optimized + * reading, use the triggered buffer. + */ + ret = ak8974_trigmeas(ak8974); + if (ret) + goto out_unlock; + ret = ak8974_getresult(ak8974, hw_values); + if (ret) + goto out_unlock; + /* + * This explicit cast to (s16) is necessary as the measurement + * is done in 2's complement with positive and negative values. + * The follwing assignment to *val will then convert the signed + * s16 value to a signed int value. + */ + *val = (s16)le16_to_cpu(hw_values[address]); +out_unlock: + mutex_unlock(&ak8974->lock); + pm_runtime_mark_last_busy(&ak8974->i2c->dev); + pm_runtime_put_autosuspend(&ak8974->i2c->dev); + + return ret; +} + static int ak8974_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) { struct ak8974 *ak8974 = iio_priv(indio_dev); - __le16 hw_values[3]; - int ret = -EINVAL; - - pm_runtime_get_sync(&ak8974->i2c->dev); - mutex_lock(&ak8974->lock); + int ret; switch (mask) { case IIO_CHAN_INFO_RAW: if (chan->address > 2) { dev_err(&ak8974->i2c->dev, "faulty channel address\n"); - ret = -EIO; - goto out_unlock; + return -EIO; } - ret = ak8974_trigmeas(ak8974); + ret = ak8974_measure_channel(ak8974, chan->address, val); if (ret) - goto out_unlock; - ret = ak8974_getresult(ak8974, hw_values); - if (ret) - goto out_unlock; - - /* - * We read all axes and discard all but one, for optimized - * reading, use the triggered buffer. - */ - *val = (s16)le16_to_cpu(hw_values[chan->address]); - - ret = IIO_VAL_INT; + return ret; + return IIO_VAL_INT; } - out_unlock: - mutex_unlock(&ak8974->lock); - pm_runtime_mark_last_busy(&ak8974->i2c->dev); - pm_runtime_put_autosuspend(&ak8974->i2c->dev); - - return ret; + return -EINVAL; } static void ak8974_fill_buffer(struct iio_dev *indio_dev)