From patchwork Sun Jan 20 15:36:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreeya Patel X-Patchwork-Id: 10772431 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 24132139A for ; Sun, 20 Jan 2019 15:37:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 121122A229 for ; Sun, 20 Jan 2019 15:37:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F41F52962A; Sun, 20 Jan 2019 15:37:02 +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 9EB382962A for ; Sun, 20 Jan 2019 15:37:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727229AbfATPgz (ORCPT ); Sun, 20 Jan 2019 10:36:55 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:41767 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726686AbfATPgz (ORCPT ); Sun, 20 Jan 2019 10:36:55 -0500 Received: by mail-pl1-f195.google.com with SMTP id u6so8539945plm.8; Sun, 20 Jan 2019 07:36:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ar1tctG7/iBTB9hE9xtJJGfnTBBR20X98oU1GdBLliM=; b=T5Ku+wIX0qFUzocIXTIz83iM1j0nX9axoBu6OmXPPS93V1SZA4U9O68tAcMkKPTZe4 Nd1cl+RfymKqilN5R+bP/AywiMVPSmIjSdpI7/2lw+t+USm6eWdxezhh8nnoJ4uK++uU 3XWhVs4crsh6oBtDG96UaTjBj/ZLshYCNwaM1V4ZMPEqmD04dwVSlLvQGPfJN5wkZXYU ZkdR4hKWw+r4bkakJvYMgcW9qECYM6pAkGCGIwJLpGQkUhrBv+5vx9G+nytWNsCywNwh t47ARTj9kVHvWRcAg4h6/JzeQcylxoTXvj+L+H1KshldJSad9da14+5qszVyfneFOo48 bPeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ar1tctG7/iBTB9hE9xtJJGfnTBBR20X98oU1GdBLliM=; b=eJgQLz8E30Up/pqQMo/sWb7i3ehY45dFlY0IPzGo1Mw4hE9hjYcL4gNFS7izZNUAO9 F7c1AKYzd6wrK3hPp9ROdZvF/2Zne/tjjqQgqLUAT81GPscv3HhJ7bWWF1ZvrC4z/uE9 gJd2BSNTtuGrFrJgVBWuVxJdBtFvblzhzb9zF8dZ8vB+vRaF+xZEMkF0MRTM3neqcpzi 0M2PqfpNu17XuvoCsp3jJJfhQAHggIvTScKxD1D+KvATkhwwtWnkN2flivCwA5UEFKlM h1cDJYJy9pbl4yXzeCBUzpCh6AKi/KbW5bdLKE3mXTJmq7sw01O/NyjwB/SvDUrS2v3p wzww== X-Gm-Message-State: AJcUukdrxSQTFl+y3nN8LKJAQ1ft1mXHDE/AcYVtoDJLMy8HRM03HFEF ez9hgjoSS4UCQg02SDi/lsY= X-Google-Smtp-Source: ALg8bN5SUcLRlkpxQnUsNJQm0T0BJI+0MzZ0cGXN9yn6dUbBTMuzA+qc/SMEc+cHmhU3jPw0heu3EQ== X-Received: by 2002:a17:902:7791:: with SMTP id o17mr26304685pll.60.1547998614534; Sun, 20 Jan 2019 07:36:54 -0800 (PST) Received: from localhost.localdomain ([223.189.18.171]) by smtp.gmail.com with ESMTPSA id o8sm21451376pfa.42.2019.01.20.07.36.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jan 2019 07:36:54 -0800 (PST) From: Shreeya Patel To: jic23@kernel.org Cc: lars@metafoo.de, Michael.Hennerich@analog.com, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, jeremyfertic@gmail.com, shreeya.patel23498@gmail.com Subject: [PATCH v3 3/3] Staging: iio: adt7316: Add regmap support Date: Sun, 20 Jan 2019 21:06:33 +0530 Message-Id: <20190120153633.18231-4-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120153633.18231-1-shreeya.patel23498@gmail.com> References: <20190120153633.18231-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 | 56 +++------- 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(+), 178 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index c7f82c3fe27c..435b65845174 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c @@ -12,60 +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 < 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 30808a897fc2..2aa0471bd140 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; @@ -1294,7 +1290,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; @@ -1411,7 +1407,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 || @@ -1424,14 +1420,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; @@ -1462,15 +1458,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; @@ -1579,10 +1575,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; @@ -1597,10 +1593,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; @@ -1616,10 +1612,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; @@ -1634,10 +1630,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; @@ -1742,11 +1738,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; @@ -1795,7 +1791,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, @@ -1881,7 +1877,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; @@ -1895,7 +1891,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; @@ -1909,7 +1905,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; @@ -1917,7 +1913,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; @@ -1966,7 +1962,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; @@ -1997,7 +1993,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; @@ -2134,7 +2130,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; @@ -2148,7 +2144,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'); @@ -2187,11 +2183,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