From patchwork Fri Mar 23 14:27:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10304813 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 9157660384 for ; Fri, 23 Mar 2018 14:27:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F8F3201B0 for ; Fri, 23 Mar 2018 14:27:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74308287B9; Fri, 23 Mar 2018 14:27:49 +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 D3520201B0 for ; Fri, 23 Mar 2018 14:27:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751531AbeCWO1e (ORCPT ); Fri, 23 Mar 2018 10:27:34 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:42869 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbeCWO1d (ORCPT ); Fri, 23 Mar 2018 10:27:33 -0400 Received: by mail-qt0-f194.google.com with SMTP id j3so1218360qtn.9; Fri, 23 Mar 2018 07:27:32 -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=PQAvghtA845y5MDXfF1coQueEMo5qCBctbMq/TsrCfU=; b=EuSbbdj3rhG27doThQhI9FJhth4f3ehTmhz1ZuwjemQ0ZkEHXYiTSIgwYVM/75Uagg MbFWK/iLHv/Fxv2H0egG8yCCP/xa3nf2KdRYkKmq8b8WurjrTp5CePTU03yvgJOpf2aW Yl8CGd9Qoav7MmiEk91GdEJQ3nghxJrgl3fXDcWkb50NxQMRg+TUXMUSdjhTwPi4QOdw uNIWFxncE1iQ4oPP5oMir4Zrq2pXEMm7V/AVpLvll7hnN5TmfqfBtRVnWahtRfwFq6rk kR2JW6jHOAMZ/9JB+8lbWhmF2W17xqNXVKBJ3ZsisEFG5Cxp2E0W0HomNP1dgF/p0Fas LmQQ== 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=PQAvghtA845y5MDXfF1coQueEMo5qCBctbMq/TsrCfU=; b=X5XHm3encu5mtEzRbDZVWAmk2tYq83dgFHGQNXv9Vyiu9EH+AxSkmewm7fUz2qjYfW io8ca6h2IR+pD2BSdyOFcchdCY/9k1eFPdZGO66ZhyAgNWqew6s1BzYfaenWLmiXpfYW FSKz4qUsN1Lo1/qL7FiGZmVS/662Lg7ypscSNnN99z3aVi3JX3TpC6PDpdHHRxVIfaKn eacvy8J6Esafn/TQ20UUZ90MYvR27wrTle/Oea4pyJ3qSYEOyrTHS1+rAsgkabgVF0Gx fDcmITYlB2HaXrnnPE3yY1NOqWy+lYclC2EQ9Lq7EtGgu1jWarqRgis3yeGPsRl2EnLk zzew== X-Gm-Message-State: AElRT7EKwrlnd4pJ5heKitHl8g/HRMDjvnUp5q1AoxCiDsvvJz+goVIz SpHdr89C5hmqY6Sg4/IQgzU= X-Google-Smtp-Source: AG47ELu7M5gaQ66Itfsekg/+blTw1G4W0dsNDQG8A+ZNDcRZjEYPzDB6ycuCI6SBb4x5U0IamEVF5w== X-Received: by 10.200.15.252 with SMTP id f57mr41511369qtk.171.1521815252054; Fri, 23 Mar 2018 07:27:32 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id l1sm6689034qtb.33.2018.03.23.07.27.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Mar 2018 07:27:31 -0700 (PDT) Date: Fri, 23 Mar 2018 11:27:27 -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 8/8] staging:iio:ade7854: Remove read_reg_* duplications Message-ID: <0af75d8bc519e2d8a38d62742fbf7de3c5899503.1521813782.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 original code had a read function per data size; after updates, all read functions tasks were centralized in a single function, but the old signature was kept to maintain the module working without problems. This patch removes a set of duplications associated with read_reg_*, and update the areas that calling the old interface by the new one. Signed-off-by: Rodrigo Siqueira --- Changes in v3: - Update commit message drivers/staging/iio/meter/ade7854-i2c.c | 33 +------------------------------ drivers/staging/iio/meter/ade7854-spi.c | 35 ++------------------------------- drivers/staging/iio/meter/ade7854.c | 18 ++++++++--------- drivers/staging/iio/meter/ade7854.h | 7 +++---- 4 files changed, 15 insertions(+), 78 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 63793f9664c7..c3aa6ea9d036 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -110,34 +110,6 @@ static int ade7854_i2c_read_reg(struct device *dev, 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) -{ - 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) -{ - 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) -{ - return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 32); -} - static int ade7854_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -149,10 +121,7 @@ static int ade7854_i2c_probe(struct i2c_client *client, return -ENOMEM; st = iio_priv(indio_dev); i2c_set_clientdata(client, indio_dev); - st->read_reg_8 = ade7854_i2c_read_reg_8; - 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->read_reg = ade7854_i2c_read_reg; 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 ee6e4d166ece..fc9146757283 100644 --- a/drivers/staging/iio/meter/ade7854-spi.c +++ b/drivers/staging/iio/meter/ade7854-spi.c @@ -94,7 +94,7 @@ static int ade7854_spi_read_reg(struct device *dev, st->tx[2] = reg_address & 0xFF; ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers)); - if (ret) { + if (ret < 0) { dev_err(&st->spi->dev, "problem when reading register 0x%02X", reg_address); goto unlock; @@ -120,34 +120,6 @@ static int ade7854_spi_read_reg(struct device *dev, return ret; } -static int ade7854_spi_read_reg_8(struct device *dev, - u16 reg_address, - u8 *val) -{ - return ade7854_spi_read_reg(dev, reg_address, (u32 *)val, 8); -} - -static int ade7854_spi_read_reg_16(struct device *dev, - u16 reg_address, - u16 *val) -{ - return ade7854_spi_read_reg(dev, reg_address, (u32 *)val, 16); -} - -static int ade7854_spi_read_reg_24(struct device *dev, - u16 reg_address, - u32 *val) -{ - return ade7854_spi_read_reg(dev, reg_address, (u32 *)val, 24); -} - -static int ade7854_spi_read_reg_32(struct device *dev, - u16 reg_address, - u32 *val) -{ - return ade7854_spi_read_reg(dev, reg_address, (u32 *)val, 32); -} - static int ade7854_spi_probe(struct spi_device *spi) { struct ade7854_state *st; @@ -158,10 +130,7 @@ static int ade7854_spi_probe(struct spi_device *spi) return -ENOMEM; st = iio_priv(indio_dev); spi_set_drvdata(spi, indio_dev); - st->read_reg_8 = ade7854_spi_read_reg_8; - 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->read_reg = ade7854_spi_read_reg; 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 45984b9a2bee..029c3bf42d4d 100644 --- a/drivers/staging/iio/meter/ade7854.c +++ b/drivers/staging/iio/meter/ade7854.c @@ -27,12 +27,12 @@ static ssize_t ade7854_read_8bit(struct device *dev, char *buf) { int ret; - u8 val = 0; + u32 val = 0; struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); - ret = st->read_reg_8(dev, this_attr->address, &val); + ret = st->read_reg(dev, this_attr->address, &val, 8); if (ret < 0) return ret; @@ -44,12 +44,12 @@ static ssize_t ade7854_read_16bit(struct device *dev, char *buf) { int ret; - u16 val = 0; + u32 val = 0; struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); - ret = st->read_reg_16(dev, this_attr->address, &val); + ret = st->read_reg(dev, this_attr->address, &val, 16); if (ret < 0) return ret; @@ -66,7 +66,7 @@ static ssize_t ade7854_read_24bit(struct device *dev, struct ade7854_state *st = iio_priv(indio_dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); - ret = st->read_reg_24(dev, this_attr->address, &val); + ret = st->read_reg(dev, this_attr->address, &val, 24); if (ret < 0) return ret; @@ -83,7 +83,7 @@ static ssize_t ade7854_read_32bit(struct device *dev, struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); - ret = st->read_reg_32(dev, this_attr->address, &val); + ret = st->read_reg(dev, this_attr->address, &val, 32); if (ret < 0) return ret; @@ -178,9 +178,9 @@ static int ade7854_reset(struct device *dev) { struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ade7854_state *st = iio_priv(indio_dev); - u16 val; + u32 val; - st->read_reg_16(dev, ADE7854_CONFIG, &val); + st->read_reg(dev, ADE7854_CONFIG, &val, 16); val |= BIT(7); /* Software Chip Reset */ return st->write_reg(dev, ADE7854_CONFIG, val, 16); @@ -415,7 +415,7 @@ static int ade7854_set_irq(struct device *dev, bool enable) int ret; u32 irqen; - ret = st->read_reg_32(dev, ADE7854_MASK0, &irqen); + ret = st->read_reg(dev, ADE7854_MASK0, &irqen, 32); if (ret < 0) return ret; diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index 290adbf56951..a51e6e3183d3 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h @@ -146,6 +146,7 @@ /** * struct ade7854_state - device instance specific data * @spi: actual spi_device + * @read_reg Wrapper function for I2C and SPI read * @write_reg Wrapper function for I2C and SPI write * @indio_dev: industrial I/O device structure * @buf_lock: mutex to protect tx and rx @@ -155,10 +156,8 @@ struct ade7854_state { struct spi_device *spi; struct i2c_client *i2c; - int (*read_reg_8)(struct device *dev, u16 reg_address, u8 *val); - 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 (*read_reg)(struct device *dev, u16 reg_address, u32 *val, + int bits); int (*write_reg)(struct device *dev, u16 reg_address, u32 val, int bits); int irq;