From patchwork Fri Mar 23 14:26:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10304803 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 5114860386 for ; Fri, 23 Mar 2018 14:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40C6A28D84 for ; Fri, 23 Mar 2018 14:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3573A28DE3; Fri, 23 Mar 2018 14:27:06 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 0D18428D84 for ; Fri, 23 Mar 2018 14:27:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751923AbeCWO1E (ORCPT ); Fri, 23 Mar 2018 10:27:04 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:42803 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840AbeCWO1D (ORCPT ); Fri, 23 Mar 2018 10:27:03 -0400 Received: by mail-qt0-f193.google.com with SMTP id j3so1216634qtn.9; Fri, 23 Mar 2018 07:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=MBvyVfHhY4QF504nNda7q4zWjmGTIapoNRB4koOi0hg=; b=TCVpjWucq+OWvN/lKTkTMLcfpNNmKST7Ji4hrVMHpgH5aeRnj937i1tqyoe25daZq4 Ys7rpsIgCOg4doYq5LS8xPHOPx2sWg2jIJ6NdxjBswN0XMh+6Ptrf0siPVpNprKCsNk2 r97ew64qxSheOeGKQQAHIvxTFKGjuAd1cqxYeQcnYk+cvEm/qaWcMrSjBUe8fXmCT3Yh KNusilqO/XAR9D+dPs+9nLjE+2Q7zzNAiGEiCEiumzkJSqfaBMzjNQUFyLAsWVFpzxTs mSqAuyFYPF+x58AyUOAfGN610+Y4SaMkx8aJCzQiTsawPbwQLYVUrZqq6YlEDscZDJS/ naVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=MBvyVfHhY4QF504nNda7q4zWjmGTIapoNRB4koOi0hg=; b=jvZnScCYieIVQKnwL4hwB5N4GmUzkiGvpLVUBZnRSfhC8ID5a2QBN5U9hJ7CPpXNnP /NlihgPwEkY6MZnCzruZvGERF8ico6jFiYIZ3rSgKE/V4Xp7hWbKl0zhpPY6MppMALo2 G5AyWT7qUbAkPIm5S5uXqJ4T1FFc77vyo2Vv6/9s5WEqgozkP8TKVlR1JvhozwUxtfHZ 3XW/5qY6g8BQ8H4Avux+7tuAkcfB59Ii0DKuv7iFTmXnNeM5hnDfAWSJcFJYFBpNPhOT K1rkffXWFrRLhqCbdcGA9KZRjClVSFi0+kjIdbKJ67dPpelFV0T7fgO4InnvzHmF/xyj BhVA== X-Gm-Message-State: AElRT7EgimbKJBIQ4M28SM4Djkt/cA2rViKrblgcsT6uALoxjwuNLcdu wANtsdgzpnQK3s6kPzDO8a8= X-Google-Smtp-Source: AG47ELusAKKWIWaDyjS3CoJWAm6hCuqSgAF8lSzJTyw5KY9rKnLBL830wBNqStd/aK+qVdEZ4lSgQQ== X-Received: by 10.237.33.34 with SMTP id 31mr27427485qtc.211.1521815222517; Fri, 23 Mar 2018 07:27:02 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id k50sm693146qtb.96.2018.03.23.07.26.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Mar 2018 07:27:02 -0700 (PDT) Date: Fri, 23 Mar 2018 11:26:57 -0300 From: Rodrigo Siqueira To: John Syne , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Greg Kroah-Hartman , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Barry Song <21cnbao@gmail.com> Cc: daniel.baluta@nxp.com, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/8] staging:iio:ade7854: Rework I2C read function Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180223 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 The read operation for the I2C function has many duplications that can be generalized into a single function. This patch reworks the read operation for I2C to centralizes all similar code in a single function. It is possible to remove all the old interface to use the new one, however, for keeping the things simple and working this patch maintain legacy interface. Signed-off-by: Rodrigo Siqueira --- Changes in v3: - Remove the use of defines that not improve the readability - Replace variable name "bytes" for "bits" - Update commit message drivers/staging/iio/meter/ade7854-i2c.c | 106 +++++++++++--------------------- 1 file changed, 37 insertions(+), 69 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 29e959fdb932..63793f9664c7 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -65,9 +65,10 @@ static int ade7854_i2c_write_reg(struct device *dev, return ret < 0 ? ret : 0; } -static int ade7854_i2c_read_reg_8(struct device *dev, - u16 reg_address, - u8 *val) +static int ade7854_i2c_read_reg(struct device *dev, + u16 reg_address, + u32 *val, + int bits) { struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); @@ -79,95 +80,62 @@ static int ade7854_i2c_read_reg_8(struct device *dev, ret = i2c_master_send(st->i2c, st->tx, 2); if (ret < 0) - goto out; + goto unlock; - ret = i2c_master_recv(st->i2c, st->rx, 1); + ret = i2c_master_recv(st->i2c, st->rx, bits); if (ret < 0) - goto out; + goto unlock; + + switch (bits) { + case 8: + *val = st->rx[0]; + break; + case 16: + *val = (st->rx[0] << 8) | st->rx[1]; + break; + case 24: + *val = (st->rx[0] << 16) | (st->rx[1] << 8) | st->rx[2]; + break; + case 32: + *val = (st->rx[0] << 24) | (st->rx[1] << 16) | + (st->rx[2] << 8) | st->rx[3]; + break; + default: + ret = -EINVAL; + goto unlock; + } - *val = st->rx[0]; -out: +unlock: mutex_unlock(&st->buf_lock); return ret; } +static int ade7854_i2c_read_reg_8(struct device *dev, + u16 reg_address, + u8 *val) +{ + return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 8); +} + static int ade7854_i2c_read_reg_16(struct device *dev, u16 reg_address, u16 *val) { - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - int ret; - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 2); - if (ret < 0) - goto out; - - ret = i2c_master_recv(st->i2c, st->rx, 2); - if (ret < 0) - goto out; - - *val = (st->rx[0] << 8) | st->rx[1]; -out: - mutex_unlock(&st->buf_lock); - return ret; + return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 16); } static int ade7854_i2c_read_reg_24(struct device *dev, u16 reg_address, u32 *val) { - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - int ret; - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 2); - if (ret < 0) - goto out; - - ret = i2c_master_recv(st->i2c, st->rx, 3); - if (ret < 0) - goto out; - - *val = (st->rx[0] << 16) | (st->rx[1] << 8) | st->rx[2]; -out: - mutex_unlock(&st->buf_lock); - return ret; + return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 24); } static int ade7854_i2c_read_reg_32(struct device *dev, u16 reg_address, u32 *val) { - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - int ret; - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 2); - if (ret < 0) - goto out; - - ret = i2c_master_recv(st->i2c, st->rx, 4); - if (ret < 0) - goto out; - - *val = (st->rx[0] << 24) | (st->rx[1] << 16) | - (st->rx[2] << 8) | st->rx[3]; -out: - mutex_unlock(&st->buf_lock); - return ret; + return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 32); } static int ade7854_i2c_probe(struct i2c_client *client,