From patchwork Wed Mar 14 18:11:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10283197 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 26B2A602BD for ; Wed, 14 Mar 2018 18:12:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13EB428591 for ; Wed, 14 Mar 2018 18:12:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 082812859E; Wed, 14 Mar 2018 18:12:04 +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 5A89E28591 for ; Wed, 14 Mar 2018 18:12:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbeCNSLu (ORCPT ); Wed, 14 Mar 2018 14:11:50 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:43795 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752330AbeCNSLs (ORCPT ); Wed, 14 Mar 2018 14:11:48 -0400 Received: by mail-qt0-f194.google.com with SMTP id s48so4429411qtb.10; Wed, 14 Mar 2018 11:11:48 -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=De3e/8ay9IwnfaaK2k4gn9nmScnaVOzbxeOPg0DtNXU=; b=svcprLHz2JtEyheM8Bee6od7DJg7WoicAY7eziRFWR6HUpSdQ+9we5wUwtK2UN3O44 +DQUmjJs5ePMQdqPquao22dMa9EOLSd2tjrxNMdObNLl12FifOkIIE539WO85zYaLdsF 3jLJhLhPaH4jDrEuURcV6m63gGzp5QJSfQ+Hvhv4CiU9u/hCt8PIYP/pcedhVCxT/Hgq Y+A8xHGQi9M/9YLD7fbC7XkzNFnU2JMhUUxdRRlvZEA1SHG/8UFvS2xDPChYBPPUozfK SevMkhryCz2/hLY2FwsVWyb1sr0oluKm42PTx2P15u7PyZKpLSQ3Pmb/q6dhPdfJ9SRM PEmQ== 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=De3e/8ay9IwnfaaK2k4gn9nmScnaVOzbxeOPg0DtNXU=; b=Xqkb/f2QUlfB8HultYWB/NNxvVHYrsepJE0OzeHN1ARkSVmi59FxcKN0N9NwDy2BNu Chm0SqYeWXu3Vo3BT2OSl8D7yJ2ITyiPutuhDv8VWci+JQXLXTvrAeBSKbbeinm/ohqu TKJBvOv/bW8lQqxIRkk4jQXhaJm8kh81eJw9XrhvuTld966O0BkDPyQDWA0xNfDAPmpF 01pUMWvkEv+Hr4Mo4S/zoQI+JtYC72BEKMTFf47gbbxwjmNp1U52awgcdmrj2QQJ1f32 xZl9uzpSNVdlXtp1Ng81xdvXLFKssc6sC9aHyosJIQgyNexuQsMRfS4Tve+JE4eouwgx fEiQ== X-Gm-Message-State: AElRT7HVJyYXADJVNLl0m8ncT3MID6qL0M6aqoQrbjRUc6SqWzjMfaHW ILJAHbQNphylNjaPI1HVllw= X-Google-Smtp-Source: AG47ELtdZ/5XAnWbrbhXcusbJtbq1zhDuK2cruD45N+GM6ar3dyoKDY8MG1eieqcWNM8g07+CazPQQ== X-Received: by 10.237.34.205 with SMTP id q13mr8156433qtc.113.1521051107523; Wed, 14 Mar 2018 11:11:47 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id k7sm1906445qkf.94.2018.03.14.11.11.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Mar 2018 11:11:46 -0700 (PDT) Date: Wed, 14 Mar 2018 15:11:43 -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 6/7] staging:iio:ade7854: Remove read_reg_* duplications Message-ID: <0461c02559fa68aa5502a18d1aaa07123176786a.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 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. During the update for use a single function, some errors handlings were updated based on the John Syne patches. Signed-off-by: Rodrigo Siqueira Signed-off-by: John Syne --- drivers/staging/iio/meter/ade7854-i2c.c | 53 +------------------------------ drivers/staging/iio/meter/ade7854-spi.c | 55 ++------------------------------- drivers/staging/iio/meter/ade7854.c | 28 ++++++++--------- drivers/staging/iio/meter/ade7854.h | 7 ++--- 4 files changed, 20 insertions(+), 123 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 845f8c348945..fc1ff08dc2d3 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -110,54 +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) -{ - int ret; - - ret = ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_8_BITS); - - return ret; -} - -static int ade7854_i2c_read_reg_16(struct device *dev, - u16 reg_address, - u16 *val) -{ - int ret; - - ret = ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_16_BITS); - - return ret; -} - -static int ade7854_i2c_read_reg_24(struct device *dev, - u16 reg_address, - u32 *val) -{ - int ret; - - ret = ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_24_BITS); - - return ret; -} - -static int ade7854_i2c_read_reg_32(struct device *dev, - u16 reg_address, - u32 *val) -{ - int ret; - - ret = ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_32_BITS); - - return ret; -} - static int ade7854_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -169,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 0feef24aa888..5711f9ff822e 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 error_spi_read_unlock; @@ -120,54 +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) -{ - int ret; - - ret = ade7854_spi_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_8_BITS); - - return ret; -} - -static int ade7854_spi_read_reg_16(struct device *dev, - u16 reg_address, - u16 *val) -{ - int ret; - - ret = ade7854_spi_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_16_BITS); - - return ret; -} - -static int ade7854_spi_read_reg_24(struct device *dev, - u16 reg_address, - u32 *val) -{ - int ret; - - ret = ade7854_spi_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_24_BITS); - - return ret; -} - -static int ade7854_spi_read_reg_32(struct device *dev, - u16 reg_address, - u32 *val) -{ - int ret; - - ret = ade7854_spi_read_reg(dev, reg_address, (u32 *)val, - DATA_SIZE_32_BITS); - - return ret; -} - static int ade7854_spi_probe(struct spi_device *spi) { struct ade7854_state *st; @@ -178,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 f9a977dcd670..09fd8c067738 100644 --- a/drivers/staging/iio/meter/ade7854.c +++ b/drivers/staging/iio/meter/ade7854.c @@ -27,13 +27,13 @@ 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); - if (ret) + ret = st->read_reg(dev, this_attr->address, &val, DATA_SIZE_8_BITS); + if (ret < 0) return ret; return sprintf(buf, "%u\n", val); @@ -44,13 +44,13 @@ 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); - if (ret) + ret = st->read_reg(dev, this_attr->address, &val, DATA_SIZE_16_BITS); + if (ret < 0) return ret; return sprintf(buf, "%u\n", val); @@ -66,8 +66,8 @@ 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); - if (ret) + ret = st->read_reg(dev, this_attr->address, &val, DATA_SIZE_24_BITS); + if (ret < 0) return ret; return sprintf(buf, "%u\n", val); @@ -83,8 +83,8 @@ 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); - if (ret) + ret = st->read_reg(dev, this_attr->address, &val, DATA_SIZE_32_BITS); + if (ret < 0) return ret; return sprintf(buf, "%u\n", val); @@ -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, DATA_SIZE_16_BITS); val |= BIT(7); /* Software Chip Reset */ return st->write_reg(dev, ADE7854_CONFIG, val, DATA_SIZE_16_BITS); @@ -415,8 +415,8 @@ static int ade7854_set_irq(struct device *dev, bool enable) int ret; u32 irqen; - ret = st->read_reg_32(dev, ADE7854_MASK0, &irqen); - if (ret) + ret = st->read_reg(dev, ADE7854_MASK0, &irqen, DATA_SIZE_32_BITS); + if (ret < 0) return ret; if (enable) diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index 3830607de7c5..3d762e74a7be 100644 --- a/drivers/staging/iio/meter/ade7854.h +++ b/drivers/staging/iio/meter/ade7854.h @@ -153,6 +153,7 @@ enum data_size { /** * 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 @@ -162,10 +163,8 @@ enum data_size { 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, + enum data_size type); int (*write_reg)(struct device *dev, u16 reg_address, u32 val, enum data_size type); int irq;