From patchwork Fri Mar 16 22:49:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10290425 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 77D86602BD for ; Fri, 16 Mar 2018 22:49:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6572129015 for ; Fri, 16 Mar 2018 22:49:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5957E290DB; Fri, 16 Mar 2018 22:49:16 +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 CCD9429015 for ; Fri, 16 Mar 2018 22:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751448AbeCPWtO (ORCPT ); Fri, 16 Mar 2018 18:49:14 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:38998 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbeCPWtN (ORCPT ); Fri, 16 Mar 2018 18:49:13 -0400 Received: by mail-qk0-f195.google.com with SMTP id j73so5322105qke.6; Fri, 16 Mar 2018 15:49:13 -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=GvftwZ9uKC8YMevU5cZUSYN5VvuVS5QJOwWYMtiusMM=; b=aeWBD2dBq5Dh0+vfr7x7zBVGT6OFjbmCaonHDLY198mlyBykGau+5CwyZPXxMUB3ba l1oHdDPkpfR3E9Oo0cn/tFDbQMIqeJCVaSFg3omUKG0F5MpOkFLPCOM7rU/mCgBerAch +3Vlk8aTdYHuzSNmDuYG4Vhwt+5V9yKfQ3hSnQTWSRfd/Rb6N7L+A3J4EIeuppyU+vXD 9a4Of4IK7P8/m4ZLkaLSINecSHa0EnYn9GW7TlfHBNugZ7Xtl1LYbloWKC4C1j97qFcJ CvjqM4HStrNndUjs0+HouE8pk1BsSlzzyfnX6XtJlrh1FvaqOB8jxheZTQBnFawOrD9y x0rA== 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=GvftwZ9uKC8YMevU5cZUSYN5VvuVS5QJOwWYMtiusMM=; b=Bw7T6i4RbfyE+ATjRaCWy7wxgCQvWD7CRPmzPTkud/IBWm8zdVHRMdvMrrnu5R7Rhm xqJ1aGsHgcgBAiLmUK1Qq3tjGoO5Wr3ohruZ/OnzH1axxijqb2kPR+cOKOGmIMS70W24 SOvUqqduMVpXgCc/hWpEUBlNHtbh8ZCJmlqtewQHaZsv06lKYxGDYWUPUl90D6urLERN SrKtcFNw/X7K36ZLbCx0TkHJ4NezFX3KvkvMyUD8apOsLJ8Xg8ThEekD2iIGZm01a7cG LHHXr0QpZDFE0rcLCWtl1v0/Fc72b6/A1TFQH/bk1mlniGJ6eNyNTALUnY2N5/s8Tz9q iFmQ== X-Gm-Message-State: AElRT7G84y2ZhoNGXVGf/zQ8kE6DwVQS4MWYyyyuGYSi3o7ap8eOfUds MleidexIeYYEjNhYWn5VR0A= X-Google-Smtp-Source: AG47ELtPPog/AxuO6VSoILjJq79wbu0IPu+0xctIpNcWCz4D8L8kf7tvEr7sTaT3OKZId8dYR06Qgw== X-Received: by 10.55.209.216 with SMTP id o85mr5319592qkl.217.1521240552950; Fri, 16 Mar 2018 15:49:12 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id r125sm5751360qkd.46.2018.03.16.15.49.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Mar 2018 15:49:12 -0700 (PDT) Date: Fri, 16 Mar 2018 19:49:08 -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 v2 3/8] staging:iio:ade7854: Rework I2C write 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 write operation using I2C has many code duplications and four different interfaces per data size. This patch introduces a single function that centralizes the main tasks. The central function inserted by this patch can easily replace all the four functions related to the data size. However, this patch does not remove any code signature for keeping the meter module work and make easier to review this patch. Signed-off-by: Rodrigo Siqueira --- drivers/staging/iio/meter/ade7854-i2c.c | 96 ++++++++++++++++----------------- drivers/staging/iio/meter/ade7854.h | 7 +++ 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 37c957482493..1daad42b1e92 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -15,86 +15,82 @@ #include #include "ade7854.h" -static int ade7854_i2c_write_reg_8(struct device *dev, - u16 reg_address, - u8 val) +static int ade7854_i2c_write_reg(struct device *dev, + u16 reg_address, + u32 val, + int bytes) { int ret; + int count; struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); mutex_lock(&st->buf_lock); st->tx[0] = (reg_address >> 8) & 0xFF; st->tx[1] = reg_address & 0xFF; - st->tx[2] = val; - ret = i2c_master_send(st->i2c, st->tx, 3); + switch (bytes) { + case DATA_SIZE_8_BITS: + st->tx[2] = val & 0xFF; + count = 3; + break; + case DATA_SIZE_16_BITS: + st->tx[2] = (val >> 8) & 0xFF; + st->tx[3] = val & 0xFF; + count = 4; + break; + case DATA_SIZE_24_BITS: + st->tx[2] = (val >> 16) & 0xFF; + st->tx[3] = (val >> 8) & 0xFF; + st->tx[4] = val & 0xFF; + count = 5; + break; + case DATA_SIZE_32_BITS: + st->tx[2] = (val >> 24) & 0xFF; + st->tx[3] = (val >> 16) & 0xFF; + st->tx[4] = (val >> 8) & 0xFF; + st->tx[5] = val & 0xFF; + count = 6; + break; + default: + ret = -EINVAL; + goto unlock; + } + + ret = i2c_master_send(st->i2c, st->tx, count); + +unlock: mutex_unlock(&st->buf_lock); return ret < 0 ? ret : 0; } +static int ade7854_i2c_write_reg_8(struct device *dev, + u16 reg_address, + u8 val) +{ + return ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_8_BITS); +} + static int ade7854_i2c_write_reg_16(struct device *dev, u16 reg_address, u16 val) { - int ret; - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - st->tx[2] = (val >> 8) & 0xFF; - st->tx[3] = val & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 4); - mutex_unlock(&st->buf_lock); - - return ret < 0 ? ret : 0; + return ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_16_BITS); } static int ade7854_i2c_write_reg_24(struct device *dev, u16 reg_address, u32 val) { - int ret; - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - st->tx[2] = (val >> 16) & 0xFF; - st->tx[3] = (val >> 8) & 0xFF; - st->tx[4] = val & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 5); - mutex_unlock(&st->buf_lock); - - return ret < 0 ? ret : 0; + return ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_24_BITS); } static int ade7854_i2c_write_reg_32(struct device *dev, u16 reg_address, u32 val) { - int ret; - struct iio_dev *indio_dev = dev_to_iio_dev(dev); - struct ade7854_state *st = iio_priv(indio_dev); - - mutex_lock(&st->buf_lock); - st->tx[0] = (reg_address >> 8) & 0xFF; - st->tx[1] = reg_address & 0xFF; - st->tx[2] = (val >> 24) & 0xFF; - st->tx[3] = (val >> 16) & 0xFF; - st->tx[4] = (val >> 8) & 0xFF; - st->tx[5] = val & 0xFF; - - ret = i2c_master_send(st->i2c, st->tx, 6); - mutex_unlock(&st->buf_lock); - - return ret < 0 ? ret : 0; + return ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_32_BITS); } static int ade7854_i2c_read_reg_8(struct device *dev, diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index a82d38224cbd..71bdd638f348 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h @@ -143,6 +143,13 @@ #define ADE7854_SPI_BURST (u32)(1000 * 1000) #define ADE7854_SPI_FAST (u32)(2000 * 1000) +enum data_size { + DATA_SIZE_8_BITS = 1, + DATA_SIZE_16_BITS, + DATA_SIZE_24_BITS, + DATA_SIZE_32_BITS, +}; + /** * struct ade7854_state - device instance specific data * @spi: actual spi_device