From patchwork Wed Mar 14 18:10:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10283183 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 D87A9602BD for ; Wed, 14 Mar 2018 18:11:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7BC0285AF for ; Wed, 14 Mar 2018 18:11:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC6B6285E1; Wed, 14 Mar 2018 18:11:09 +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 2937B285F2 for ; Wed, 14 Mar 2018 18:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbeCNSK7 (ORCPT ); Wed, 14 Mar 2018 14:10:59 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:40495 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbeCNSK5 (ORCPT ); Wed, 14 Mar 2018 14:10:57 -0400 Received: by mail-qk0-f196.google.com with SMTP id o25so4475381qkl.7; Wed, 14 Mar 2018 11:10:57 -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=gdSKA0llo/f4WvBhfqQC3HkNOmtgd2lNG/rSxkyBFL8=; b=KUblMZYi2IqKhKA7IqFQljaRZi8XpjYP0O3ghrVjcE5BNsqZkWwoQvmyYnCgg7XZ2P aL75936YHIRAKfyArrrDFGZA1ER9LxUTwug37IY8E9nLVOBakJpNocJAc3SWfbd+5jcU U+dCGOf3yL3fabLqSiThQ5y1yAJF5K5SIHarQYRRD4C/rNzyJKyQlOo4cscCkvUCnPjC xEful4sC4HG1aU2LGJ3BzlONHztfFNdWctpF8HyvrYcPPMHySJFsHkJSQJCrxXM2ttco QiadF4Vy78hU+xqQmYl4oNp1qSECqRa0iba+g2pSV7Cqj/gKIMG6ByZ/OBH7Xinl8HQH MHyQ== 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=gdSKA0llo/f4WvBhfqQC3HkNOmtgd2lNG/rSxkyBFL8=; b=YNvtwMsZJxM2VlgazmT2XuNksQA4GF1MADwRS8HTKzhBLz8xe5W9Vc5qmGrzjUSEcL WGnEsd50rn653n6/jM3EN+5M/9DSFYJS+272CZ52cQtXg2Dc1ZfhBiN3pRpr6PPVkdU9 XUFG67Z7sAXcqXetMMNstS4vs3RX8NQo18PXoohOlB9f2QBk6A4gasd65Do5cpLH+mLg VrBvznY3FkGFr7cbSYgnavoc6+jkFX9aDde3bOdZCyW9lOpOaC/8/0dzIOLw9hDkoAPJ 0E/rOAlLN7DGI1XsMDq+jLCdb/VhHmRO+GbgpIz1E59b2rEs+J65qwKDcZopFJteDln1 pHEw== X-Gm-Message-State: AElRT7GCnE/L4cGuHe6a/+GGzo/bjMfkZlak4PWqNLC4a8x3OOAKks9+ I+3Bj2j+dKkjPPdZRcdcCxE= X-Google-Smtp-Source: AG47ELsqexlmpQynoplZRHKXj0KCEnZscYj1xFYKLyEHfrMvJCC7sG7EcsxX7nUPx2USAjAyfKSb9g== X-Received: by 10.55.110.197 with SMTP id j188mr8034701qkc.155.1521051056460; Wed, 14 Mar 2018 11:10:56 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id i11sm2469568qtc.30.2018.03.14.11.10.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Mar 2018 11:10:56 -0700 (PDT) Date: Wed, 14 Mar 2018 15:10:52 -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 3/7] staging:iio:ade7854: Replace many functions for one function Message-ID: <6a661af6660a1951b4138e0be4269013686cce13.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 This patch removes code duplications related to the write_reg_* functions and centralizes them in a single function. Also, it eliminates the legacy functions and replaces them by a unique signature that is used by SPI and I2C. Signed-off-by: Rodrigo Siqueira --- drivers/staging/iio/meter/ade7854-i2c.c | 50 +-------------------------------- drivers/staging/iio/meter/ade7854-spi.c | 49 +------------------------------- drivers/staging/iio/meter/ade7854.c | 12 ++++---- drivers/staging/iio/meter/ade7854.h | 9 +++--- 4 files changed, 12 insertions(+), 108 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 03133a05eae4..f302359d2265 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -65,51 +65,6 @@ static int ade7854_i2c_write_reg(struct device *dev, 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; - - ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_16_BITS); - - return ret; -} - -static int ade7854_i2c_write_reg_24(struct device *dev, - u16 reg_address, - u32 val) -{ - int ret; - - ret = ade7854_i2c_write_reg(dev, reg_address, val, DATA_SIZE_24_BITS); - - return ret; -} - -static int ade7854_i2c_write_reg_32(struct device *dev, - u16 reg_address, - u32 val) -{ - int ret; - - 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) @@ -230,10 +185,7 @@ static int ade7854_i2c_probe(struct i2c_client *client, st->read_reg_16 = ade7854_i2c_read_reg_16; st->read_reg_24 = ade7854_i2c_read_reg_24; st->read_reg_32 = ade7854_i2c_read_reg_32; - st->write_reg_8 = ade7854_i2c_write_reg_8; - st->write_reg_16 = ade7854_i2c_write_reg_16; - st->write_reg_24 = ade7854_i2c_write_reg_24; - st->write_reg_32 = ade7854_i2c_write_reg_32; + st->write_reg = ade7854_i2c_write_reg; st->i2c = client; st->irq = client->irq; diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c index 0dae118428cf..df3df85f9440 100644 --- a/drivers/staging/iio/meter/ade7854-spi.c +++ b/drivers/staging/iio/meter/ade7854-spi.c @@ -67,50 +67,6 @@ static int ade7854_spi_write_reg(struct device *dev, return ret; } -static int ade7854_spi_write_reg_8(struct device *dev, - u16 reg_address, - u8 val) -{ - int ret; - - ret = ade7854_spi_write_reg(dev, reg_address, val, DATA_SIZE_8_BITS); - - return ret; -} - -static int ade7854_spi_write_reg_16(struct device *dev, - u16 reg_address, - u16 val) -{ - int ret; - - ret = ade7854_spi_write_reg(dev, reg_address, val, DATA_SIZE_16_BITS); - - return ret; -} - -static int ade7854_spi_write_reg_24(struct device *dev, - u16 reg_address, - u32 val) -{ - int ret; - - ret = ade7854_spi_write_reg(dev, reg_address, val, DATA_SIZE_24_BITS); - - return ret; -} - -static int ade7854_spi_write_reg_32(struct device *dev, - u16 reg_address, - u32 val) -{ - int ret; - - ret = ade7854_spi_write_reg(dev, reg_address, val, DATA_SIZE_32_BITS); - - return ret; -} - static int ade7854_spi_read_reg_8(struct device *dev, u16 reg_address, u8 *val) @@ -276,10 +232,7 @@ static int ade7854_spi_probe(struct spi_device *spi) st->read_reg_16 = ade7854_spi_read_reg_16; st->read_reg_24 = ade7854_spi_read_reg_24; st->read_reg_32 = ade7854_spi_read_reg_32; - st->write_reg_8 = ade7854_spi_write_reg_8; - st->write_reg_16 = ade7854_spi_write_reg_16; - st->write_reg_24 = ade7854_spi_write_reg_24; - st->write_reg_32 = ade7854_spi_write_reg_32; + st->write_reg = ade7854_spi_write_reg; st->irq = spi->irq; st->spi = spi; diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c index 90d07cdca4b8..f9a977dcd670 100644 --- a/drivers/staging/iio/meter/ade7854.c +++ b/drivers/staging/iio/meter/ade7854.c @@ -105,7 +105,7 @@ static ssize_t ade7854_write_8bit(struct device *dev, ret = kstrtou8(buf, 10, &val); if (ret) goto error_ret; - ret = st->write_reg_8(dev, this_attr->address, val); + ret = st->write_reg(dev, this_attr->address, val, DATA_SIZE_8_BITS); error_ret: return ret ? ret : len; @@ -126,7 +126,7 @@ static ssize_t ade7854_write_16bit(struct device *dev, ret = kstrtou16(buf, 10, &val); if (ret) goto error_ret; - ret = st->write_reg_16(dev, this_attr->address, val); + ret = st->write_reg(dev, this_attr->address, val, DATA_SIZE_16_BITS); error_ret: return ret ? ret : len; @@ -147,7 +147,7 @@ static ssize_t ade7854_write_24bit(struct device *dev, ret = kstrtou32(buf, 10, &val); if (ret) goto error_ret; - ret = st->write_reg_24(dev, this_attr->address, val); + ret = st->write_reg(dev, this_attr->address, val, DATA_SIZE_24_BITS); error_ret: return ret ? ret : len; @@ -168,7 +168,7 @@ static ssize_t ade7854_write_32bit(struct device *dev, ret = kstrtou32(buf, 10, &val); if (ret) goto error_ret; - ret = st->write_reg_32(dev, this_attr->address, val); + ret = st->write_reg(dev, this_attr->address, val, DATA_SIZE_32_BITS); error_ret: return ret ? ret : len; @@ -183,7 +183,7 @@ static int ade7854_reset(struct device *dev) st->read_reg_16(dev, ADE7854_CONFIG, &val); val |= BIT(7); /* Software Chip Reset */ - return st->write_reg_16(dev, ADE7854_CONFIG, val); + return st->write_reg(dev, ADE7854_CONFIG, val, DATA_SIZE_16_BITS); } static IIO_DEV_ATTR_AIGAIN(0644, @@ -426,7 +426,7 @@ static int ade7854_set_irq(struct device *dev, bool enable) else irqen &= ~BIT(17); - return st->write_reg_32(dev, ADE7854_MASK0, irqen); + return st->write_reg(dev, ADE7854_MASK0, irqen, DATA_SIZE_32_BITS); } static int ade7854_initial_setup(struct iio_dev *indio_dev) diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index 71bdd638f348..3830607de7c5 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h @@ -152,7 +152,8 @@ enum data_size { /** * struct ade7854_state - device instance specific data - * @spi: actual spi_device + * @spi: actual spi_device + * @write_reg Wrapper function for I2C and SPI write * @indio_dev: industrial I/O device structure * @buf_lock: mutex to protect tx and rx * @tx: transmit buffer @@ -165,10 +166,8 @@ struct ade7854_state { int (*read_reg_16)(struct device *dev, u16 reg_address, u16 *val); int (*read_reg_24)(struct device *dev, u16 reg_address, u32 *val); int (*read_reg_32)(struct device *dev, u16 reg_address, u32 *val); - int (*write_reg_8)(struct device *dev, u16 reg_address, u8 val); - int (*write_reg_16)(struct device *dev, u16 reg_address, u16 val); - int (*write_reg_24)(struct device *dev, u16 reg_address, u32 val); - int (*write_reg_32)(struct device *dev, u16 reg_address, u32 val); + int (*write_reg)(struct device *dev, u16 reg_address, u32 val, + enum data_size type); int irq; struct mutex buf_lock; u8 tx[ADE7854_MAX_TX] ____cacheline_aligned;