From patchwork Wed Mar 14 18:10:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10283173 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 092E6602BD for ; Wed, 14 Mar 2018 18:10:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE48D285AF for ; Wed, 14 Mar 2018 18:10:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2F7A285EB; Wed, 14 Mar 2018 18:10:37 +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=unavailable 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 73996285DA for ; Wed, 14 Mar 2018 18:10:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751543AbeCNSKY (ORCPT ); Wed, 14 Mar 2018 14:10:24 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33066 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752205AbeCNSKX (ORCPT ); Wed, 14 Mar 2018 14:10:23 -0400 Received: by mail-qk0-f196.google.com with SMTP id f25so4502695qkm.0; Wed, 14 Mar 2018 11:10:22 -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=PTdry8F41JbHxS5A5FjuHoNtr7ekHflKyArmCSB3kSY=; b=bVcfO+/wqNOCOgm1uPvx3M6UhZvksNapZsXudVY8YUv11OmQAbB9dWC4VhC6aQeSpj agWnX7iPuJKhMhuAfF/Ae+hP2l36RibEXqNQOmWDY9ZonW95nXqRRLhmAr+Bjx465xZU t2Y8+aIHijL+u2B5NSEa8Q7okczWaG2g7eo0oyKo9dRP8CwTxpCG7Kjj4HVIahll64Dj kbs6vpwR8NgOqDEvJ0NqRPAdath7evqliJiSfXrBZ8HU+T1LOZX9JuXKNtj0GhisWIxR grxhLQaS1wLThGAZYtTg3eXqgMIMcn6SSjI7RKti8/AcQsC3UI6y/jFLVeW+z6zEiDTD VTpw== 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=PTdry8F41JbHxS5A5FjuHoNtr7ekHflKyArmCSB3kSY=; b=OIUvFgyyDk/3YqqE5QkExVwlPbFqd8IouhMNytEXdcv3ZJIeR2QEXEPI7XrbVfKllD RooE9gSJvSKTxtEFfBcsQSVPaEHGlGVDVASrhkxF/DuZck7sGD2LZbTKU2gqyy8eVpcQ ypDjNspu/Di+y8t1v3ahG4ssoYt5PuoDzhzviuyFFHBMcKM7ubSj2pfazXFqLLO1gLmU nnmkeWzvzbVRJnMLwuWyin/g1HVQjqjlqku6gDoSW+z84qMIwD4ORr1kttJf7NhDuN65 xNFVS+FbVmzxYwEnlp7+keqfh0z/xTcB6wds8sjn1p1qIyHz8+mBKtZO8BCZnlL73OKe TSfQ== X-Gm-Message-State: AElRT7FYdIiwh1vQ2m+JSeHV7b8PwrTbRD3FXuKGRNzNASkUzA2AfLsU +U3ulN8dRAXeuW93fXK92fU= X-Google-Smtp-Source: AG47ELsBsTbpuRHaRXZiq+e4IH0tloWnTHcCTEYE7MV/ad81tCpONnZl3rr/Ot+DJPqXdHAEggEdNQ== X-Received: by 10.55.185.69 with SMTP id j66mr5835579qkf.216.1521051022245; Wed, 14 Mar 2018 11:10:22 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id z127sm1916062qkb.1.2018.03.14.11.10.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Mar 2018 11:10:21 -0700 (PDT) Date: Wed, 14 Mar 2018 15:10:18 -0300 From: Rodrigo Siqueira To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Greg Kroah-Hartman , Barry Song <21cnbao@gmail.com>, John Syne Cc: daniel.baluta@nxp.com, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] staging:iio:ade7854: Rework I2C write function Message-ID: <98c74382f0ea9c5d33f7ea9c9697d87889c1baa2.1521037060.git.rodrigosiqueiramelo@gmail.com> 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 | 89 +++++++++++++++++++-------------- drivers/staging/iio/meter/ade7854.h | 7 +++ 2 files changed, 58 insertions(+), 38 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 317e4f0d8176..03133a05eae4 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -15,41 +15,74 @@ #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, + enum data_size type) { 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 (type) { + 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 error_i2c_write_unlock; + } + + ret = i2c_master_send(st->i2c, st->tx, count); + +error_i2c_write_unlock: mutex_unlock(&st->buf_lock); return ret; } +static int ade7854_i2c_write_reg_8(struct device *dev, + u16 reg_address, + u8 val) +{ + int ret; + + ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_8_BITS); + + return ret; +} + 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); + ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_16_BITS); return ret; } @@ -59,18 +92,8 @@ static int ade7854_i2c_write_reg_24(struct device *dev, 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); + ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_24_BITS); return ret; } @@ -80,23 +103,13 @@ static int ade7854_i2c_write_reg_32(struct device *dev, 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); + ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_32_BITS); return ret; } + static int ade7854_i2c_read_reg_8(struct device *dev, u16 reg_address, u8 *val) 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