From patchwork Sat Jan 19 18:39:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreeya Patel X-Patchwork-Id: 10772115 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63C926C5 for ; Sat, 19 Jan 2019 18:39:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51CE32CC20 for ; Sat, 19 Jan 2019 18:39:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42C7A2CC23; Sat, 19 Jan 2019 18:39:53 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 BF2602CC20 for ; Sat, 19 Jan 2019 18:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728933AbfASSjr (ORCPT ); Sat, 19 Jan 2019 13:39:47 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:46439 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728590AbfASSjr (ORCPT ); Sat, 19 Jan 2019 13:39:47 -0500 Received: by mail-pf1-f196.google.com with SMTP id c73so8177695pfe.13; Sat, 19 Jan 2019 10:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=RtrWvJAg8tLRadW6+RGapN9Sh+dFGoMqmkYArH9t5tY=; b=UNow0tf4Q13A0CNJ9QQS57gJzTJYgNE5OJu+9QlzocQhuAoF3Ipa/RXfX6s0oXQmXb SNAGhSmEn71joXJuLY0Ij7f9EZzKdbWRJgCU4IgIJWW+Xz+LrZGgI02hVFCb9PSwxgwW I6ZhPtiF13A8qOQmgborzcGuFzUIH8f6oLJVH80xFJAjtPpypb1hrTK0g9TgGVZuIokO lRmm8q9SZbDanby3aefdF038Ytx2klIEunoZEy5NK/CiK6XDZtJZGQgKOy67Cgb8Six7 1DUBXiYTpCjxb3Ws34AlSqzWsBUkoxvnPZ5ZhbcmPd3K5dNnlnJWTybzO+sCYuPtug48 BtYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RtrWvJAg8tLRadW6+RGapN9Sh+dFGoMqmkYArH9t5tY=; b=klBib8689/osjqUOd3wwE02RAYvOwi1vNADbS6pG5vTotRI4ilNUWidkhWMSutMB+3 zUBPVZLlIuoTtkahgszeQDJc5YicxR/FYzKmnm30yNW2zMqbP24nXrOMvYnDp0NuUxhz v+iaKqjhdL5PlQDHAI0MGsU8Revh+d+OXqwoc4ehJw0XpYBvtQ+YNl+1YF+VPzvlwjiW BkXkSly9irOHkR+0ZL9mVgTvKB36aneKo9gUCwv+zonKtsIhECNojJqNDHkYbAS0PSDQ H5XaFjiBShhb+v6jrzE6I8t+RAwgwrA4EW12+6ejAiF9ZULk2yFwo3fIDRQpvyjukklo tUQQ== X-Gm-Message-State: AJcUukcWyMWs8PZfuSW0Ygj2o7Hk4WLwxS0ZvG+HUkJC7k0kgBoxBNQ+ 7KgCcBEfV7z8NUBdwkTDoRM= X-Google-Smtp-Source: ALg8bN60L4OE3J/62YXR/m1V18tCI9i4Ii50F/1N7EkJEzkEg1yPiwJsSSSPWg9ZWb4Sq/ytvUIG+g== X-Received: by 2002:a63:374e:: with SMTP id g14mr22819442pgn.59.1547923186093; Sat, 19 Jan 2019 10:39:46 -0800 (PST) Received: from localhost.localdomain ([49.33.214.52]) by smtp.gmail.com with ESMTPSA id m20sm10127471pgb.56.2019.01.19.10.39.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 10:39:45 -0800 (PST) From: Shreeya Patel To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, shreeya.patel23498@gmail.com Subject: [PATCH v2 1/3] Staging: iio: adt7316: Remove irq from bus structure Date: Sun, 20 Jan 2019 00:09:30 +0530 Message-Id: <20190119183932.14321-2-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119183932.14321-1-shreeya.patel23498@gmail.com> References: <20190119183932.14321-1-shreeya.patel23498@gmail.com> 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 interrupt request is not needed to be present in the bus structure. It is a good option to pass it as a parameter in the probe function instead of having it in the bus structure. Signed-off-by: Shreeya Patel --- drivers/staging/iio/addac/adt7316-i2c.c | 3 +-- drivers/staging/iio/addac/adt7316-spi.c | 4 ++-- drivers/staging/iio/addac/adt7316.c | 15 +++++++-------- drivers/staging/iio/addac/adt7316.h | 3 +-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index ac91163656b5..335c17731cf7 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c @@ -103,14 +103,13 @@ static int adt7316_i2c_probe(struct i2c_client *client, { struct adt7316_bus bus = { .client = client, - .irq = client->irq, .read = adt7316_i2c_read, .write = adt7316_i2c_write, .multi_read = adt7316_i2c_multi_read, .multi_write = adt7316_i2c_multi_write, }; - return adt7316_probe(&client->dev, &bus, id->name); + return adt7316_probe(&client->dev, &bus, id->name, client->irq); } static const struct i2c_device_id adt7316_i2c_id[] = { diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c index e75827e326a6..adaaa3eecd04 100644 --- a/drivers/staging/iio/addac/adt7316-spi.c +++ b/drivers/staging/iio/addac/adt7316-spi.c @@ -93,7 +93,6 @@ static int adt7316_spi_probe(struct spi_device *spi_dev) { struct adt7316_bus bus = { .client = spi_dev, - .irq = spi_dev->irq, .read = adt7316_spi_read, .write = adt7316_spi_write, .multi_read = adt7316_spi_multi_read, @@ -112,7 +111,8 @@ static int adt7316_spi_probe(struct spi_device *spi_dev) adt7316_spi_write(spi_dev, 0, 0); adt7316_spi_write(spi_dev, 0, 0); - return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias); + return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias, + spi_dev->irq); } static const struct spi_device_id adt7316_spi_id[] = { diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c index 1ca4ee0f30ee..6b4b80fd80cc 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -1807,12 +1807,12 @@ static irqreturn_t adt7316_event_handler(int irq, void *private) return IRQ_HANDLED; } -static int adt7316_setup_irq(struct iio_dev *indio_dev) +static int adt7316_setup_irq(struct iio_dev *indio_dev, int irq) { struct adt7316_chip_info *chip = iio_priv(indio_dev); int irq_type, ret; - irq_type = irqd_get_trigger_type(irq_get_irq_data(chip->bus.irq)); + irq_type = irqd_get_trigger_type(irq_get_irq_data(irq)); switch (irq_type) { case IRQF_TRIGGER_HIGH: @@ -1828,13 +1828,12 @@ static int adt7316_setup_irq(struct iio_dev *indio_dev) break; } - ret = devm_request_threaded_irq(&indio_dev->dev, chip->bus.irq, + ret = devm_request_threaded_irq(&indio_dev->dev, irq, NULL, adt7316_event_handler, irq_type | IRQF_ONESHOT, indio_dev->name, indio_dev); if (ret) { - dev_err(&indio_dev->dev, "failed to request irq %d\n", - chip->bus.irq); + dev_err(&indio_dev->dev, "failed to request irq %d\n", irq); return ret; } @@ -2134,7 +2133,7 @@ static const struct iio_info adt7516_info = { * device probe and remove */ int adt7316_probe(struct device *dev, struct adt7316_bus *bus, - const char *name) + const char *name, int irq) { struct adt7316_chip_info *chip; struct iio_dev *indio_dev; @@ -2180,8 +2179,8 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus, indio_dev->name = name; indio_dev->modes = INDIO_DIRECT_MODE; - if (chip->bus.irq > 0) { - ret = adt7316_setup_irq(indio_dev); + if (irq > 0) { + ret = adt7316_setup_irq(indio_dev, irq); if (ret) return ret; } diff --git a/drivers/staging/iio/addac/adt7316.h b/drivers/staging/iio/addac/adt7316.h index fd7c5c92b599..03d5300a98cd 100644 --- a/drivers/staging/iio/addac/adt7316.h +++ b/drivers/staging/iio/addac/adt7316.h @@ -16,7 +16,6 @@ struct adt7316_bus { void *client; - int irq; int (*read)(void *client, u8 reg, u8 *data); int (*write)(void *client, u8 reg, u8 val); int (*multi_read)(void *client, u8 first_reg, u8 count, u8 *data); @@ -30,6 +29,6 @@ extern const struct dev_pm_ops adt7316_pm_ops; #define ADT7316_PM_OPS NULL #endif int adt7316_probe(struct device *dev, struct adt7316_bus *bus, - const char *name); + const char *name, int irq); #endif From patchwork Sat Jan 19 18:39:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreeya Patel X-Patchwork-Id: 10772117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 859E36C5 for ; Sat, 19 Jan 2019 18:39:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 780CC2CC22 for ; Sat, 19 Jan 2019 18:39:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C8722CC28; Sat, 19 Jan 2019 18:39:59 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 E0D192CC22 for ; Sat, 19 Jan 2019 18:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729031AbfASSjx (ORCPT ); Sat, 19 Jan 2019 13:39:53 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35014 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728590AbfASSjw (ORCPT ); Sat, 19 Jan 2019 13:39:52 -0500 Received: by mail-pf1-f196.google.com with SMTP id z9so8210789pfi.2; Sat, 19 Jan 2019 10:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=sVOAklPk261L5+RTM1KzurR44bu8p9J8BGuUmJ4GCSg=; b=nehJCdfosBLJWbp4TGUGU5Q2xMmcFXHpMIVpJJOz72gSaPStSwSrJDduvJ1TN4+xsS i5kGQR+BxN/U9mwOL+DXT+nV/88/UBHLkZ3CocTp0Hx6Dwa5nyfEHEsF5TOvKQByMp/o NwaRajsgTqrWojJ6tTOXwxOLzSri1JJ7u273LaZHZpnpG4B+Xqdy+u9PkJAgn72PkypQ FnLZXq33ED56aZGmUhMPMIY3DFOWIOiHq+srHWFYYN8wZMjGjxDERdZberCuHW91uDpe nvL0nQcCBZ6+cWuuygnQkQ5xX4bO3dfyyA+7XNpGGUKGshTJyKnvhPcZYeyekr3NBZ0E JVAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=sVOAklPk261L5+RTM1KzurR44bu8p9J8BGuUmJ4GCSg=; b=JpFmzwlxm3Lz0T56Gizo5EjsykbAmiUM3yiQtcIyuRlz36gbBk5Rd/0Ssk8PUuoe3h OG1fj7+i9pZMjHhKHBpN+dX1CCVbmC0Rxw+e1q6oVd1yxgUOUeEyOOH2FQxZGnUS5r0h pVdFAVETzQ8WJONt3xkII0CxmEkGLvqy1W+Be3X9oz7F9bHEwrUnqsW9qKlmAYvy682L EeyQ2NDPmqILgWh9y3CYSt8mDdk/vRsUuI2Df85LvUhpPYiIo2pSi5VbDY6AqestwbaS 0xXB+f0YnsbUhUpC8BClY7WHRwmzxMTCm9iP8JdnV8IMz5Xn8EElR5eCMLgwIcUQMtpo Onmg== X-Gm-Message-State: AJcUukeRUlGZUEUF9FMoEg0WOiuBqqSaHqlWW1d7VllJO3smg+e1Ylcf X3J9FbwZfz7lBqMZ0RHngP4= X-Google-Smtp-Source: ALg8bN6Wh4HAnsz6LaDG05bGZ/WCLvIhzPQg7go7Tg4bX8Dd+4O2TXj0D5pArRFGS+/ngbVEtStvUQ== X-Received: by 2002:a62:5d0c:: with SMTP id r12mr25055773pfb.0.1547923190835; Sat, 19 Jan 2019 10:39:50 -0800 (PST) Received: from localhost.localdomain ([49.33.214.52]) by smtp.gmail.com with ESMTPSA id m20sm10127471pgb.56.2019.01.19.10.39.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 10:39:50 -0800 (PST) From: Shreeya Patel To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, shreeya.patel23498@gmail.com Subject: [PATCH v2 2/3] Staging: iio: adt7316: Remove multi read and write functions Date: Sun, 20 Jan 2019 00:09:31 +0530 Message-Id: <20190119183932.14321-3-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119183932.14321-1-shreeya.patel23498@gmail.com> References: <20190119183932.14321-1-shreeya.patel23498@gmail.com> 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 Currently, adt7316 doesn't use multi read and multi write functions hence remove the redundant code and make the necessary changes in the code. Signed-off-by: Shreeya Patel --- drivers/staging/iio/addac/adt7316-i2c.c | 40 ------------------------- drivers/staging/iio/addac/adt7316-spi.c | 31 ++++--------------- drivers/staging/iio/addac/adt7316.h | 2 -- 3 files changed, 6 insertions(+), 67 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index 335c17731cf7..40aa9e2f1966 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c @@ -56,44 +56,6 @@ static int adt7316_i2c_write(void *client, u8 reg, u8 data) return ret; } -static int adt7316_i2c_multi_read(void *client, u8 reg, u8 count, u8 *data) -{ - struct i2c_client *cl = client; - int i, ret = 0; - - if (count > ADT7316_REG_MAX_ADDR) - count = ADT7316_REG_MAX_ADDR; - - for (i = 0; i < count; i++) { - ret = adt7316_i2c_read(cl, reg, &data[i]); - if (ret < 0) { - dev_err(&cl->dev, "I2C multi read error\n"); - return ret; - } - } - - return 0; -} - -static int adt7316_i2c_multi_write(void *client, u8 reg, u8 count, u8 *data) -{ - struct i2c_client *cl = client; - int i, ret = 0; - - if (count > ADT7316_REG_MAX_ADDR) - count = ADT7316_REG_MAX_ADDR; - - for (i = 0; i < count; i++) { - ret = adt7316_i2c_write(cl, reg, data[i]); - if (ret < 0) { - dev_err(&cl->dev, "I2C multi write error\n"); - return ret; - } - } - - return 0; -} - /* * device probe and remove */ @@ -105,8 +67,6 @@ static int adt7316_i2c_probe(struct i2c_client *client, .client = client, .read = adt7316_i2c_read, .write = adt7316_i2c_write, - .multi_read = adt7316_i2c_multi_read, - .multi_write = adt7316_i2c_multi_write, }; return adt7316_probe(&client->dev, &bus, id->name, client->irq); diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c index adaaa3eecd04..1a78dc1e2840 100644 --- a/drivers/staging/iio/addac/adt7316-spi.c +++ b/drivers/staging/iio/addac/adt7316-spi.c @@ -23,15 +23,12 @@ * adt7316 register access by SPI */ -static int adt7316_spi_multi_read(void *client, u8 reg, u8 count, u8 *data) +static int adt7316_spi_read(void *client, u8 reg, u8 *data) { struct spi_device *spi_dev = client; u8 cmd[2]; int ret = 0; - if (count > ADT7316_REG_MAX_ADDR) - count = ADT7316_REG_MAX_ADDR; - cmd[0] = ADT7316_SPI_CMD_WRITE; cmd[1] = reg; @@ -43,7 +40,7 @@ static int adt7316_spi_multi_read(void *client, u8 reg, u8 count, u8 *data) cmd[0] = ADT7316_SPI_CMD_READ; - ret = spi_write_then_read(spi_dev, cmd, 1, data, count); + ret = spi_write_then_read(spi_dev, cmd, 1, data, 1); if (ret < 0) { dev_err(&spi_dev->dev, "SPI read data error\n"); return ret; @@ -52,21 +49,17 @@ static int adt7316_spi_multi_read(void *client, u8 reg, u8 count, u8 *data) return 0; } -static int adt7316_spi_multi_write(void *client, u8 reg, u8 count, u8 *data) +static int adt7316_spi_write(void *client, u8 reg, u8 val) { struct spi_device *spi_dev = client; u8 buf[ADT7316_REG_MAX_ADDR + 2]; - int i, ret = 0; - - if (count > ADT7316_REG_MAX_ADDR) - count = ADT7316_REG_MAX_ADDR; + int ret = 0; buf[0] = ADT7316_SPI_CMD_WRITE; buf[1] = reg; - for (i = 0; i < count; i++) - buf[i + 2] = data[i]; + buf[2] = val; - ret = spi_write(spi_dev, buf, count + 2); + ret = spi_write(spi_dev, buf, 3); if (ret < 0) { dev_err(&spi_dev->dev, "SPI write error\n"); return ret; @@ -75,16 +68,6 @@ static int adt7316_spi_multi_write(void *client, u8 reg, u8 count, u8 *data) return ret; } -static int adt7316_spi_read(void *client, u8 reg, u8 *data) -{ - return adt7316_spi_multi_read(client, reg, 1, data); -} - -static int adt7316_spi_write(void *client, u8 reg, u8 val) -{ - return adt7316_spi_multi_write(client, reg, 1, &val); -} - /* * device probe and remove */ @@ -95,8 +78,6 @@ static int adt7316_spi_probe(struct spi_device *spi_dev) .client = spi_dev, .read = adt7316_spi_read, .write = adt7316_spi_write, - .multi_read = adt7316_spi_multi_read, - .multi_write = adt7316_spi_multi_write, }; /* don't exceed max specified SPI CLK frequency */ diff --git a/drivers/staging/iio/addac/adt7316.h b/drivers/staging/iio/addac/adt7316.h index 03d5300a98cd..e9f288420234 100644 --- a/drivers/staging/iio/addac/adt7316.h +++ b/drivers/staging/iio/addac/adt7316.h @@ -18,8 +18,6 @@ struct adt7316_bus { void *client; int (*read)(void *client, u8 reg, u8 *data); int (*write)(void *client, u8 reg, u8 val); - int (*multi_read)(void *client, u8 first_reg, u8 count, u8 *data); - int (*multi_write)(void *client, u8 first_reg, u8 count, u8 *data); }; #ifdef CONFIG_PM_SLEEP From patchwork Sat Jan 19 18:39:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreeya Patel X-Patchwork-Id: 10772119 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C162E6C5 for ; Sat, 19 Jan 2019 18:40:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B14782CC22 for ; Sat, 19 Jan 2019 18:40:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A59E62CC24; Sat, 19 Jan 2019 18:40:00 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 558532CC23 for ; Sat, 19 Jan 2019 18:39:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729107AbfASSj6 (ORCPT ); Sat, 19 Jan 2019 13:39:58 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35500 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728590AbfASSj6 (ORCPT ); Sat, 19 Jan 2019 13:39:58 -0500 Received: by mail-pg1-f193.google.com with SMTP id s198so7598571pgs.2; Sat, 19 Jan 2019 10:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=2EPO+fM/mTjeHsrEISnyS4ADN2UH/JfRGv8iwdIWb+o=; b=fUxO2dFla85GMlOqfFkQcI/xqJtnKKEk1wnhADIwli0MFBCmqDnhiGxtCrhAucSSAl 870wXSeAXJaY3WI2XI1luZT6E6AyHfMMLU6jeyZwCf/crGG7XSlHzQzs2xmYRkN46FIc qj/iiiaOmaA1pVFCV2fD68HeoNj5rTgrmHObliUvjBfiGkhE/VzGdIaJr0FqO9r1Nluc 4LhmqarzrrbnBQzQdyd08QHTwgOzpVBwS567jet7FyRjmQiguTvbfMGVlWS4Obh7+VOy JDwqYagikmw7/pTuEpRgJDeu7k7U5A39INN8xUHv06WO4jDC0/DTcddoc5RpQVAXwvPS 8d2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2EPO+fM/mTjeHsrEISnyS4ADN2UH/JfRGv8iwdIWb+o=; b=azEO5ORZQ5V7dh6goMZ6IyybXMMn+1JAHKFX/FTFPzrxV/E52e+58ymP2OJPxLeosZ LrA/ifzO1qd/LB/91qgJJCNXVoPTZOQ2nEq/GZfavGi2R005GWPW6X28KOjiAM4d0u98 QPG0432CxJrW7qeMm+f6tKilMgMzVvZ4BzuwUhHsnxkJGGkesBi68wWrqzWr7xNKMNqu wEfxqLrzHZKPB5yjerrVKplSdo6MbZeve20ACrDkLn46pRjw8ggJ98i3xZJpo5rLWR+O Hfq/DkS5X63giAIhuB6eP21FZNEw+cicopkQen4WO7Tj8A1X2IuojDC2kmayY0ozNBxT K7ng== X-Gm-Message-State: AJcUukeSbrg+3rrNSPndICap6tBYGe7zSbn4VYzDc687/g1xzJ/9vsgy TtPcLgbs0Ll4kvAFbj8SszQ= X-Google-Smtp-Source: ALg8bN6gxswg8/J4z3QJsBZJdgI5fQOVr8nO/Hg7HckqYpeNJpqNdxWaXag1qk1ASs+Tf28y6/5CHQ== X-Received: by 2002:a63:4745:: with SMTP id w5mr22778618pgk.377.1547923195926; Sat, 19 Jan 2019 10:39:55 -0800 (PST) Received: from localhost.localdomain ([49.33.214.52]) by smtp.gmail.com with ESMTPSA id m20sm10127471pgb.56.2019.01.19.10.39.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 10:39:55 -0800 (PST) From: Shreeya Patel To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, shreeya.patel23498@gmail.com Subject: [PATCH v2 3/3] Staging: iio: adt7316: Add regmap support Date: Sun, 20 Jan 2019 00:09:32 +0530 Message-Id: <20190119183932.14321-4-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119183932.14321-1-shreeya.patel23498@gmail.com> References: <20190119183932.14321-1-shreeya.patel23498@gmail.com> 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 Both i2c and spi drivers have functions for reading and writing to/from registers. Remove this redundant and common code by using regmap API. Signed-off-by: Shreeya Patel --- drivers/staging/iio/addac/adt7316-i2c.c | 60 +++-------- drivers/staging/iio/addac/adt7316-spi.c | 74 +++---------- drivers/staging/iio/addac/adt7316.c | 132 ++++++++++++------------ drivers/staging/iio/addac/adt7316.h | 10 +- 4 files changed, 94 insertions(+), 182 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index 40aa9e2f1966..435b65845174 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c @@ -12,64 +12,28 @@ #include #include #include +#include #include "adt7316.h" -/* - * adt7316 register access by I2C - */ -static int adt7316_i2c_read(void *client, u8 reg, u8 *data) -{ - struct i2c_client *cl = client; - int ret; - - ret = i2c_smbus_write_byte(cl, reg); - if (ret < 0) { - dev_err(&cl->dev, "I2C fail to select reg\n"); - return ret; - } - - ret = i2c_smbus_read_byte(client); - - if (!ret) - return -EIO; - - if (ret < 0) { - dev_err(&cl->dev, "I2C read error\n"); - return ret; - } - - *data = ret; - - return 0; -} - -static int adt7316_i2c_write(void *client, u8 reg, u8 data) -{ - struct i2c_client *cl = client; - int ret = 0; - - ret = i2c_smbus_write_byte_data(cl, reg, data); - if (ret < 0) - dev_err(&cl->dev, "I2C write error\n"); - - return ret; -} - /* * device probe and remove */ - static int adt7316_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct adt7316_bus bus = { - .client = client, - .read = adt7316_i2c_read, - .write = adt7316_i2c_write, - }; + struct regmap *regmap; + + regmap = devm_regmap_init_i2c(client, &adt7316_regmap_config); + + if (IS_ERR(regmap)) { + dev_err(&client->dev, "Error initializing i2c regmap: %ld\n", + PTR_ERR(regmap)); + return PTR_ERR(regmap); + } - return adt7316_probe(&client->dev, &bus, id->name, client->irq); + return adt7316_probe(&client->dev, regmap, id ? id->name : NULL, + client->irq); } static const struct i2c_device_id adt7316_i2c_id[] = { diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c index 1a78dc1e2840..203b5c3ada6e 100644 --- a/drivers/staging/iio/addac/adt7316-spi.c +++ b/drivers/staging/iio/addac/adt7316-spi.c @@ -11,74 +11,19 @@ #include #include #include +#include #include #include "adt7316.h" #define ADT7316_SPI_MAX_FREQ_HZ 5000000 -#define ADT7316_SPI_CMD_READ 0x91 -#define ADT7316_SPI_CMD_WRITE 0x90 - -/* - * adt7316 register access by SPI - */ - -static int adt7316_spi_read(void *client, u8 reg, u8 *data) -{ - struct spi_device *spi_dev = client; - u8 cmd[2]; - int ret = 0; - - cmd[0] = ADT7316_SPI_CMD_WRITE; - cmd[1] = reg; - - ret = spi_write(spi_dev, cmd, 2); - if (ret < 0) { - dev_err(&spi_dev->dev, "SPI fail to select reg\n"); - return ret; - } - - cmd[0] = ADT7316_SPI_CMD_READ; - - ret = spi_write_then_read(spi_dev, cmd, 1, data, 1); - if (ret < 0) { - dev_err(&spi_dev->dev, "SPI read data error\n"); - return ret; - } - - return 0; -} - -static int adt7316_spi_write(void *client, u8 reg, u8 val) -{ - struct spi_device *spi_dev = client; - u8 buf[ADT7316_REG_MAX_ADDR + 2]; - int ret = 0; - - buf[0] = ADT7316_SPI_CMD_WRITE; - buf[1] = reg; - buf[2] = val; - - ret = spi_write(spi_dev, buf, 3); - if (ret < 0) { - dev_err(&spi_dev->dev, "SPI write error\n"); - return ret; - } - - return ret; -} /* * device probe and remove */ - static int adt7316_spi_probe(struct spi_device *spi_dev) { - struct adt7316_bus bus = { - .client = spi_dev, - .read = adt7316_spi_read, - .write = adt7316_spi_write, - }; + struct regmap *regmap; /* don't exceed max specified SPI CLK frequency */ if (spi_dev->max_speed_hz > ADT7316_SPI_MAX_FREQ_HZ) { @@ -87,12 +32,19 @@ static int adt7316_spi_probe(struct spi_device *spi_dev) return -EINVAL; } + regmap = devm_regmap_init_spi(spi_dev, &adt7316_regmap_config); + if (IS_ERR(regmap)) { + dev_err(&spi_dev->dev, "Error initializing spi regmap: %ld\n", + PTR_ERR(regmap)); + return PTR_ERR(regmap); + } + /* switch from default I2C protocol to SPI protocol */ - adt7316_spi_write(spi_dev, 0, 0); - adt7316_spi_write(spi_dev, 0, 0); - adt7316_spi_write(spi_dev, 0, 0); + regmap_write(regmap, 0, 0); + regmap_write(regmap, 0, 0); + regmap_write(regmap, 0, 0); - return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias, + return adt7316_probe(&spi_dev->dev, regmap, spi_dev->modalias, spi_dev->irq); } diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c index 6b4b80fd80cc..301920f64a57 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -176,7 +177,7 @@ */ struct adt7316_chip_info { - struct adt7316_bus bus; + struct regmap *regmap; struct gpio_desc *ldac_pin; u16 int_mask; /* 0x2f */ u8 config1; @@ -237,7 +238,7 @@ static ssize_t _adt7316_store_enabled(struct adt7316_chip_info *chip, else config1 = chip->config1 & ~ADT7316_EN; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1); + ret = regmap_write(chip->regmap, ADT7316_CONFIG1, config1); if (ret) return -EIO; @@ -301,7 +302,7 @@ static ssize_t adt7316_store_select_ex_temp(struct device *dev, if (buf[0] == '1') config1 |= ADT7516_SEL_EX_TEMP; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1); + ret = regmap_write(chip->regmap, ADT7316_CONFIG1, config1); if (ret) return -EIO; @@ -342,7 +343,7 @@ static ssize_t adt7316_store_mode(struct device *dev, if (!memcmp(buf, "single_channel", 14)) config2 |= ADT7316_AD_SINGLE_CH_MODE; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2); + ret = regmap_write(chip->regmap, ADT7316_CONFIG2, config2); if (ret) return -EIO; @@ -435,7 +436,7 @@ static ssize_t adt7316_store_ad_channel(struct device *dev, config2 |= data; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2); + ret = regmap_write(chip->regmap, ADT7316_CONFIG2, config2); if (ret) return -EIO; @@ -495,7 +496,7 @@ static ssize_t adt7316_store_disable_averaging(struct device *dev, if (buf[0] == '1') config2 |= ADT7316_DISABLE_AVERAGING; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2); + ret = regmap_write(chip->regmap, ADT7316_CONFIG2, config2); if (ret) return -EIO; @@ -534,7 +535,7 @@ static ssize_t adt7316_store_enable_smbus_timeout(struct device *dev, if (buf[0] == '1') config2 |= ADT7316_EN_SMBUS_TIMEOUT; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2); + ret = regmap_write(chip->regmap, ADT7316_CONFIG2, config2); if (ret) return -EIO; @@ -572,7 +573,7 @@ static ssize_t adt7316_store_powerdown(struct device *dev, if (buf[0] == '1') config1 |= ADT7316_PD; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1); + ret = regmap_write(chip->regmap, ADT7316_CONFIG1, config1); if (ret) return -EIO; @@ -610,7 +611,7 @@ static ssize_t adt7316_store_fast_ad_clock(struct device *dev, if (buf[0] == '1') config3 |= ADT7316_ADCLK_22_5; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, config3); if (ret) return -EIO; @@ -663,7 +664,7 @@ static ssize_t adt7316_store_da_high_resolution(struct device *dev, config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION); } - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, config3); if (ret) return -EIO; @@ -709,7 +710,7 @@ static ssize_t adt7316_store_AIN_internal_Vref(struct device *dev, else config3 = chip->config3 | ADT7516_AIN_IN_VREF; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, config3); if (ret) return -EIO; @@ -748,7 +749,7 @@ static ssize_t adt7316_store_enable_prop_DACA(struct device *dev, if (buf[0] == '1') config3 |= ADT7316_EN_IN_TEMP_PROP_DACA; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, config3); if (ret) return -EIO; @@ -787,7 +788,7 @@ static ssize_t adt7316_store_enable_prop_DACB(struct device *dev, if (buf[0] == '1') config3 |= ADT7316_EN_EX_TEMP_PROP_DACB; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, config3); if (ret) return -EIO; @@ -830,7 +831,7 @@ static ssize_t adt7316_store_DAC_2Vref_ch_mask(struct device *dev, dac_config = chip->dac_config & (~ADT7316_DA_2VREF_CH_MASK); dac_config |= data; - ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config); + ret = regmap_write(chip->regmap, ADT7316_DAC_CONFIG, dac_config); if (ret) return -EIO; @@ -890,7 +891,7 @@ static ssize_t adt7316_store_DAC_update_mode(struct device *dev, dac_config = chip->dac_config & (~ADT7316_DA_EN_MODE_MASK); dac_config |= data; - ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config); + ret = regmap_write(chip->regmap, ADT7316_DAC_CONFIG, dac_config); if (ret) return -EIO; @@ -945,8 +946,8 @@ static ssize_t adt7316_store_update_DAC(struct device *dev, ldac_config = chip->ldac_config & (~ADT7316_LDAC_EN_DA_MASK); ldac_config |= data; - ret = chip->bus.write(chip->bus.client, ADT7316_LDAC_CONFIG, - ldac_config); + ret = regmap_write(chip->regmap, ADT7316_LDAC_CONFIG, + ldac_config); if (ret) return -EIO; } else { @@ -993,7 +994,7 @@ static ssize_t adt7316_store_DA_AB_Vref_bypass(struct device *dev, if (buf[0] == '1') dac_config |= ADT7316_VREF_BYPASS_DAC_AB; - ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config); + ret = regmap_write(chip->regmap, ADT7316_DAC_CONFIG, dac_config); if (ret) return -EIO; @@ -1038,7 +1039,7 @@ static ssize_t adt7316_store_DA_CD_Vref_bypass(struct device *dev, if (buf[0] == '1') dac_config |= ADT7316_VREF_BYPASS_DAC_CD; - ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config); + ret = regmap_write(chip->regmap, ADT7316_DAC_CONFIG, dac_config); if (ret) return -EIO; @@ -1098,8 +1099,7 @@ static ssize_t adt7316_store_DAC_internal_Vref(struct device *dev, ldac_config = chip->ldac_config | ADT7316_DAC_IN_VREF; } - ret = chip->bus.write(chip->bus.client, ADT7316_LDAC_CONFIG, - ldac_config); + ret = regmap_write(chip->regmap, ADT7316_LDAC_CONFIG, ldac_config); if (ret) return -EIO; @@ -1117,7 +1117,7 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip, int channel, char *buf) { u16 data; - u8 msb, lsb; + unsigned int msb, lsb; char sign = ' '; int ret; @@ -1127,13 +1127,12 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip, switch (channel) { case ADT7316_AD_SINGLE_CH_IN: - ret = chip->bus.read(chip->bus.client, - ADT7316_LSB_IN_TEMP_VDD, &lsb); + ret = regmap_read(chip->regmap, ADT7316_LSB_IN_TEMP_VDD, &lsb); if (ret) return -EIO; - ret = chip->bus.read(chip->bus.client, - ADT7316_AD_MSB_DATA_BASE + channel, &msb); + ret = regmap_read(chip->regmap, + ADT7316_AD_MSB_DATA_BASE + channel, &msb); if (ret) return -EIO; @@ -1141,14 +1140,12 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip, data |= lsb & ADT7316_LSB_IN_TEMP_MASK; break; case ADT7316_AD_SINGLE_CH_VDD: - ret = chip->bus.read(chip->bus.client, - ADT7316_LSB_IN_TEMP_VDD, &lsb); + ret = regmap_read(chip->regmap, ADT7316_LSB_IN_TEMP_VDD, &lsb); if (ret) return -EIO; - ret = chip->bus.read(chip->bus.client, - - ADT7316_AD_MSB_DATA_BASE + channel, &msb); + ret = regmap_read(chip->regmap, + ADT7316_AD_MSB_DATA_BASE + channel, &msb); if (ret) return -EIO; @@ -1156,13 +1153,12 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip, data |= (lsb & ADT7316_LSB_VDD_MASK) >> ADT7316_LSB_VDD_OFFSET; return sprintf(buf, "%d\n", data); default: /* ex_temp and ain */ - ret = chip->bus.read(chip->bus.client, - ADT7316_LSB_EX_TEMP_AIN, &lsb); + ret = regmap_read(chip->regmap, ADT7316_LSB_EX_TEMP_AIN, &lsb); if (ret) return -EIO; - ret = chip->bus.read(chip->bus.client, - ADT7316_AD_MSB_DATA_BASE + channel, &msb); + ret = regmap_read(chip->regmap, + ADT7316_AD_MSB_DATA_BASE + channel, &msb); if (ret) return -EIO; @@ -1262,10 +1258,10 @@ static ssize_t adt7316_show_temp_offset(struct adt7316_chip_info *chip, int offset_addr, char *buf) { int data; - u8 val; + unsigned int val; int ret; - ret = chip->bus.read(chip->bus.client, offset_addr, &val); + ret = regmap_read(chip->regmap, offset_addr, &val); if (ret) return -EIO; @@ -1292,7 +1288,7 @@ static ssize_t adt7316_store_temp_offset(struct adt7316_chip_info *chip, val = (u8)data; - ret = chip->bus.write(chip->bus.client, offset_addr, val); + ret = regmap_write(chip->regmap, offset_addr, val); if (ret) return -EIO; @@ -1409,7 +1405,7 @@ static ssize_t adt7316_show_DAC(struct adt7316_chip_info *chip, int channel, char *buf) { u16 data; - u8 msb, lsb, offset; + unsigned int msb, lsb, offset; int ret; if (channel >= ADT7316_DA_MSB_DATA_REGS || @@ -1422,14 +1418,14 @@ static ssize_t adt7316_show_DAC(struct adt7316_chip_info *chip, offset = chip->dac_bits - 8; if (chip->dac_bits > 8) { - ret = chip->bus.read(chip->bus.client, - ADT7316_DA_DATA_BASE + channel * 2, &lsb); + ret = regmap_read(chip->regmap, + ADT7316_DA_DATA_BASE + channel * 2, &lsb); if (ret) return -EIO; } - ret = chip->bus.read(chip->bus.client, - ADT7316_DA_DATA_BASE + 1 + channel * 2, &msb); + ret = regmap_read(chip->regmap, ADT7316_DA_DATA_BASE + 1 + channel * 2, + &msb); if (ret) return -EIO; @@ -1460,15 +1456,15 @@ static ssize_t adt7316_store_DAC(struct adt7316_chip_info *chip, if (chip->dac_bits > 8) { lsb = data & (1 << offset); - ret = chip->bus.write(chip->bus.client, - ADT7316_DA_DATA_BASE + channel * 2, lsb); + ret = regmap_write(chip->regmap, + ADT7316_DA_DATA_BASE + channel * 2, lsb); if (ret) return -EIO; } msb = data >> offset; - ret = chip->bus.write(chip->bus.client, - ADT7316_DA_DATA_BASE + 1 + channel * 2, msb); + ret = regmap_write(chip->regmap, ADT7316_DA_DATA_BASE + 1 + channel * 2, + msb); if (ret) return -EIO; @@ -1577,10 +1573,10 @@ static ssize_t adt7316_show_device_id(struct device *dev, { struct iio_dev *dev_info = dev_to_iio_dev(dev); struct adt7316_chip_info *chip = iio_priv(dev_info); - u8 id; + unsigned int id; int ret; - ret = chip->bus.read(chip->bus.client, ADT7316_DEVICE_ID, &id); + ret = regmap_read(chip->regmap, ADT7316_DEVICE_ID, &id); if (ret) return -EIO; @@ -1595,10 +1591,10 @@ static ssize_t adt7316_show_manufactorer_id(struct device *dev, { struct iio_dev *dev_info = dev_to_iio_dev(dev); struct adt7316_chip_info *chip = iio_priv(dev_info); - u8 id; + unsigned int id; int ret; - ret = chip->bus.read(chip->bus.client, ADT7316_MANUFACTURE_ID, &id); + ret = regmap_read(chip->regmap, ADT7316_MANUFACTURE_ID, &id); if (ret) return -EIO; @@ -1614,10 +1610,10 @@ static ssize_t adt7316_show_device_rev(struct device *dev, { struct iio_dev *dev_info = dev_to_iio_dev(dev); struct adt7316_chip_info *chip = iio_priv(dev_info); - u8 rev; + unsigned int rev; int ret; - ret = chip->bus.read(chip->bus.client, ADT7316_DEVICE_REV, &rev); + ret = regmap_read(chip->regmap, ADT7316_DEVICE_REV, &rev); if (ret) return -EIO; @@ -1632,10 +1628,10 @@ static ssize_t adt7316_show_bus_type(struct device *dev, { struct iio_dev *dev_info = dev_to_iio_dev(dev); struct adt7316_chip_info *chip = iio_priv(dev_info); - u8 stat; + unsigned int stat; int ret; - ret = chip->bus.read(chip->bus.client, ADT7316_SPI_LOCK_STAT, &stat); + ret = regmap_read(chip->regmap, ADT7316_SPI_LOCK_STAT, &stat); if (ret) return -EIO; @@ -1740,11 +1736,11 @@ static irqreturn_t adt7316_event_handler(int irq, void *private) { struct iio_dev *indio_dev = private; struct adt7316_chip_info *chip = iio_priv(indio_dev); - u8 stat1, stat2; + unsigned int stat1, stat2; int ret; s64 time; - ret = chip->bus.read(chip->bus.client, ADT7316_INT_STAT1, &stat1); + ret = regmap_read(chip->regmap, ADT7316_INT_STAT1, &stat1); if (!ret) { if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX) stat1 &= 0x1F; @@ -1793,7 +1789,7 @@ static irqreturn_t adt7316_event_handler(int irq, void *private) IIO_EV_DIR_EITHER), time); } - ret = chip->bus.read(chip->bus.client, ADT7316_INT_STAT2, &stat2); + ret = regmap_read(chip->regmap, ADT7316_INT_STAT2, &stat2); if (!ret) { if (stat2 & ADT7316_INT_MASK2_VDD) iio_push_event(indio_dev, @@ -1879,7 +1875,7 @@ static ssize_t adt7316_set_int_mask(struct device *dev, else mask = ADT7316_INT_MASK2_VDD; /* disable vdd int */ - ret = chip->bus.write(chip->bus.client, ADT7316_INT_MASK2, mask); + ret = regmap_write(chip->regmap, ADT7316_INT_MASK2, mask); if (!ret) { chip->int_mask &= ~ADT7316_VDD_INT_MASK; chip->int_mask |= data & ADT7316_VDD_INT_MASK; @@ -1893,7 +1889,7 @@ static ssize_t adt7316_set_int_mask(struct device *dev, /* mask in reg is opposite, set 1 to disable */ mask = (~data) & ADT7316_TEMP_AIN_INT_MASK; } - ret = chip->bus.write(chip->bus.client, ADT7316_INT_MASK1, mask); + ret = regmap_write(chip->regmap, ADT7316_INT_MASK1, mask); chip->int_mask = mask; @@ -1907,7 +1903,7 @@ static inline ssize_t adt7316_show_ad_bound(struct device *dev, struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev *dev_info = dev_to_iio_dev(dev); struct adt7316_chip_info *chip = iio_priv(dev_info); - u8 val; + unsigned int val; int data; int ret; @@ -1915,7 +1911,7 @@ static inline ssize_t adt7316_show_ad_bound(struct device *dev, this_attr->address > ADT7316_EX_TEMP_LOW) return -EPERM; - ret = chip->bus.read(chip->bus.client, this_attr->address, &val); + ret = regmap_read(chip->regmap, this_attr->address, &val); if (ret) return -EIO; @@ -1964,7 +1960,7 @@ static inline ssize_t adt7316_set_ad_bound(struct device *dev, val = (u8)data; - ret = chip->bus.write(chip->bus.client, this_attr->address, val); + ret = regmap_write(chip->regmap, this_attr->address, val); if (ret) return -EIO; @@ -1995,7 +1991,7 @@ static ssize_t adt7316_set_int_enabled(struct device *dev, if (buf[0] == '1') config1 |= ADT7316_INT_EN; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1); + ret = regmap_write(chip->regmap, ADT7316_CONFIG1, config1); if (ret) return -EIO; @@ -2132,7 +2128,7 @@ static const struct iio_info adt7516_info = { /* * device probe and remove */ -int adt7316_probe(struct device *dev, struct adt7316_bus *bus, +int adt7316_probe(struct device *dev, struct regmap *regmap, const char *name, int irq) { struct adt7316_chip_info *chip; @@ -2146,7 +2142,7 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus, /* this is only used for device removal purposes */ dev_set_drvdata(dev, indio_dev); - chip->bus = *bus; + chip->regmap = regmap; if (name[4] == '3') chip->id = ID_ADT7316 + (name[6] - '6'); @@ -2185,11 +2181,11 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus, return ret; } - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, chip->config1); + ret = regmap_write(chip->regmap, ADT7316_CONFIG1, chip->config1); if (ret) return -EIO; - ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, chip->config3); + ret = regmap_write(chip->regmap, ADT7316_CONFIG3, chip->config3); if (ret) return -EIO; diff --git a/drivers/staging/iio/addac/adt7316.h b/drivers/staging/iio/addac/adt7316.h index e9f288420234..0162d4026e88 100644 --- a/drivers/staging/iio/addac/adt7316.h +++ b/drivers/staging/iio/addac/adt7316.h @@ -11,13 +11,13 @@ #include #include +#include #define ADT7316_REG_MAX_ADDR 0x3F -struct adt7316_bus { - void *client; - int (*read)(void *client, u8 reg, u8 *data); - int (*write)(void *client, u8 reg, u8 val); +static const struct regmap_config adt7316_regmap_config = { + .reg_bits = 8, + .val_bits = 8, }; #ifdef CONFIG_PM_SLEEP @@ -26,7 +26,7 @@ extern const struct dev_pm_ops adt7316_pm_ops; #else #define ADT7316_PM_OPS NULL #endif -int adt7316_probe(struct device *dev, struct adt7316_bus *bus, +int adt7316_probe(struct device *dev, struct regmap *regmap, const char *name, int irq); #endif