From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4140376-1521240643-2-11902015514557051 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, FREEMAIL_FORGED_FROMDOMAIN 0.249, FREEMAIL_FROM 0.001, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_MED -2.3, SPF_PASS -0.001, LANGUAGES rocaen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='140.211.166.133', Host='smtp2.osuosl.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: plain='us-ascii' X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: driverdev-devel-bounces@linuxdriverproject.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521240642; b=FJ1Ko2UmkEopXdQ5gmA4iw3/XtUMRYvAaUi/YngqJ+8xzWD OYcgFnVaaAuj+E5Dgr/wH90T4x6KLO17/InxQZp4y6WWxeKXKwQlnXttE304mAuc p0bfXOD6YpkmfzBZQ/2MAUQh699p0HjmJnS2wIB6/rRviljyHHpmhvxXSQN0W6af KbXc3gJkalgScEEpXgKgQ93jIrfw7Lj9kmJMMM79HhzTuBoxTNFbaBl+5iSGiznx i79yfdFBKctKiDjxrs2TS/B5lnDcinIqBsWpGXWVWGtT7nQHjQWE9vtGzaSn4XIj pNCRTPwCDIL/xOHCDE06bNjwBa9OOsceU9E5kZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:to:subject:message-id :references:mime-version:in-reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:content-type :content-transfer-encoding:sender; s=arctest; t=1521240642; bh=o /EvNN/4sS2Km7yjXgui+sVBkb6cOJ8lSPHwDprmf0k=; b=kM22F2IuYnuV6rST/ eP6Zg/XHmObo3CAhbaDs0M7tc/yA7MinLqOehKc4dThVVywi1aLfXV65v1qw9DIu C6dNZ8xhO0+tlop6qZnZNof676h60JCRT1C6RbG9Lj6eHmmfpXIXlctQ9fINcHv2 9uAI3+CUuKbLuH7myDr88ER+LyypQX8NbPnJD9fJNjTDcyVS4KzlyixY6xm/HzpK 7u4p7jjpol+9DZN/RB9e7XUolpUecuVMzJFaoubPIEIvUB8sFDEcAuxHWZ5exmZm EvLVsVPnJcqRUVfmgT3gfVlnHfYRKzJNvMbdCKOleXglRey6kJfOv6CUK66LUB42 r3PoA== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=fX9q04J2 x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=fail (p=none,has-list-id=yes,d=none) header.from=gmail.com; iprev=pass policy.iprev=140.211.166.133 (smtp2.osuosl.org); spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org smtp.helo=hemlock.osuosl.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-google-dkim=fail (message has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=F6ngLkLM; x-ptr=fail x-ptr-helo=hemlock.osuosl.org x-ptr-lookup=smtp2.osuosl.org; x-return-mx=pass smtp.domain=linuxdriverproject.org smtp.result=pass smtp_is_org_domain=yes header.domain=gmail.com header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128 Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=fX9q04J2 x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=fail (p=none,has-list-id=yes,d=none) header.from=gmail.com; iprev=pass policy.iprev=140.211.166.133 (smtp2.osuosl.org); spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org smtp.helo=hemlock.osuosl.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-google-dkim=fail (message has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=F6ngLkLM; x-ptr=fail x-ptr-helo=hemlock.osuosl.org x-ptr-lookup=smtp2.osuosl.org; x-return-mx=pass smtp.domain=linuxdriverproject.org smtp.result=pass smtp_is_org_domain=yes header.domain=gmail.com header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128 X-Remote-Delivered-To: driverdev-devel@osuosl.org X-Google-Smtp-Source: AG47ELt8hqnd3XU709kN4FvbJCBIkS0iXVxiAuC+qA4ljTVb7nYVp0wacUvqvYwSTeO9+x/mgkxIVQ== Date: Fri, 16 Mar 2018 19:50:29 -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> Subject: [PATCH v2 8/8] staging:iio:ade7854: Remove read_reg_* duplications Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180223 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.24 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, daniel.baluta@nxp.com, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 | 37 +------------------------------ drivers/staging/iio/meter/ade7854-spi.c | 39 ++------------------------------- drivers/staging/iio/meter/ade7854.c | 18 +++++++-------- drivers/staging/iio/meter/ade7854.h | 7 +++--- 4 files changed, 15 insertions(+), 86 deletions(-) diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 20db8eedb84a..162c171a8851 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -110,38 +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, - DATA_SIZE_8_BITS); -} - -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, - DATA_SIZE_16_BITS); -} - -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, - DATA_SIZE_24_BITS); -} - -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, - DATA_SIZE_32_BITS); -} - static int ade7854_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -153,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 964d6c6e76d1..66b8a8767a26 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,38 +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, - DATA_SIZE_8_BITS); -} - -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, - DATA_SIZE_16_BITS); -} - -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, - DATA_SIZE_24_BITS); -} - -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, - DATA_SIZE_32_BITS); -} - static int ade7854_spi_probe(struct spi_device *spi) { struct ade7854_state *st; @@ -162,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 4aa7c6ce0016..09fd8c067738 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, DATA_SIZE_8_BITS); 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, DATA_SIZE_16_BITS); 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, DATA_SIZE_24_BITS); 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, DATA_SIZE_32_BITS); 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, DATA_SIZE_16_BITS); val |= BIT(7); /* Software Chip Reset */ return st->write_reg(dev, ADE7854_CONFIG, val, DATA_SIZE_16_BITS); @@ -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, DATA_SIZE_32_BITS); if (ret < 0) return ret; diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h index aa29faf7c91f..78584f01d052 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, + int type); int (*write_reg)(struct device *dev, u16 reg_address, u32 val, int type); int irq; -- 2.16.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel