Add support for the TI ADS8344 A/DC chips
Subsystems (2)
v2 cover Add support for the TI ADS8344 A/DC chips
Hello,
this is the second version of a small series adding the support for the Texas Instruments ADS8344 ADC chip. This chip has a 16-bit 8-Channel ADC and is access directly through SPI.
The first patch add the binding documentation and the second one, the driver itself.
Changelog:
v1->v2:
- Remove the mention to the #io-channel-cells in the first patch, as there is no consumer.
- Remove scan_index and scan_type, they are not used.
- Use defines for building the command and remove the comment.
- Remove the goto and the label in the probe() function as the label was only use once.
- Remove the "#ifdef CONFIG_OF", the driver already depends on OF.
- Don't use of_match_ptr and rename ads8344_dt_id to ads8344_of_match.
Gregory
Gregory CLEMENT (2):
dt-bindings: iio: adc: Add bindings for TI ADS8344 A/DC chips
iio: adc: Add driver for the TI ADS8344 A/DC chips
.../bindings/iio/adc/ti-ads8344.txt | 19 ++ drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ti-ads8344.c | 200 ++++++++++++++++++ 4 files changed, 230 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt create mode 100644 drivers/iio/adc/ti-ads8344.c
Signature · 1 line
2.20.1
PATCH v2 1/2 dt-bindings: iio: adc: Add bindings for TI ADS8344 A/DC chips
This adds device tree bindings for the TI ADS8344 A/DC chips.
--- .../bindings/iio/adc/ti-ads8344.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt
Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt new file +19 -0
@@ -0,0 +1,19 @@ +* Texas Instruments ADS8344 A/DC chip + +Required properties: + - compatible: Must be "ti,ads8344" + - reg: SPI chip select number for the device + - vref-supply: phandle to a regulator node that supplies the + reference voltage + +Recommended properties: + - spi-max-frequency: Definition as per + Documentation/devicetree/bindings/spi/spi-bus.txt + +Example: +adc@0 { + compatible = "ti,ads8344"; + reg = <0>; + vref-supply = <&refin_supply>; + spi-max-frequency = <10000000>; +};
Signature · 1 line
2.20.1
Re: [PATCH v2 1/2] dt-bindings: iio: adc: Add bindings for TI ADS8344 A/DC chips
Quoted 8 lines · Gregory CLEMENT
This adds device tree bindings for the TI ADS8344 A/DC chips.
Signed-off-by Gregory CLEMENT <[email protected]>--- .../bindings/iio/adc/ti-ads8344.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt
PATCH v2 2/2 iio: adc: Add driver for the TI ADS8344 A/DC chips
In reply to Gregory CLEMENTThis adds support for the Texas Instruments ADS8344 ADC chip. This chip has a 16-bit 8-Channel ADC and is access directly through SPI.
--- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ti-ads8344.c | 200 +++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 drivers/iio/adc/ti-ads8344.c
drivers/iio/adc/Kconfig +10 -0
@@ -967,6 +967,16 @@ config TI_ADS7950 To compile this driver as a module, choose M here: the module will be called ti-ads7950. +config TI_ADS8344 + tristate "Texas Instruments ADS8344" + depends on SPI && OF + help + If you say yes here you get support for Texas Instruments ADS8344 + ADC chips + + This driver can also be built as a module. If so, the module will be + called ti-ads8344. + config TI_ADS8688 tristate "Texas Instruments ADS8688" depends on SPI && OF
drivers/iio/adc/Makefile +1 -0
@@ -87,6 +87,7 @@ obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o obj-$(CONFIG_TI_ADS7950) += ti-ads7950.o +obj-$(CONFIG_TI_ADS8344) += ti-ads8344.o obj-$(CONFIG_TI_ADS8688) += ti-ads8688.o obj-$(CONFIG_TI_ADS124S08) += ti-ads124s08.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o
drivers/iio/adc/ti-ads8344.c new file +200 -0
200 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v2 2/2] iio: adc: Add driver for the TI ADS8344 A/DC chips
Quoted 50 lines · Gregory CLEMENT
This adds support for the Texas Instruments ADS8344 ADC chip. This chip has a 16-bit 8-Channel ADC and is access directly through SPI.
Signed-off-by Gregory CLEMENT <[email protected]>--- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ti-ads8344.c | 200 +++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 drivers/iio/adc/ti-ads8344.cdrivers/iio/adc/Kconfig +10
-0@@ -967,6 +967,16 @@ config TI_ADS7950 To compile this driver as a module, choose M here: the module will be called ti-ads7950. +config TI_ADS8344 + tristate "Texas Instruments ADS8344" + depends on SPI && OF + help + If you say yes here you get support for Texas Instruments ADS8344 + ADC chips + + This driver can also be built as a module. If so, the module will be + called ti-ads8344. + config TI_ADS8688 tristate "Texas Instruments ADS8688" depends on SPI && OFdrivers/iio/adc/Makefile +1
-0@@ -87,6 +87,7 @@ obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o obj-$(CONFIG_TI_ADS7950) += ti-ads7950.o +obj-$(CONFIG_TI_ADS8344) += ti-ads8344.o obj-$(CONFIG_TI_ADS8688) += ti-ads8688.o obj-$(CONFIG_TI_ADS124S08) += ti-ads124s08.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.odrivers/iio/adc/ti-ads8344.c new file +0
-0
drivers/iio/adc/ti-ads8344.c line 1
Quoted 1 line
drivers/iio/adc/ti-ads8344.c new file +1
-0@@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0+
Inconsistency in License.
Quoted 14 lines
drivers/iio/adc/ti-ads8344.c new file +13
-0+* ADS8344 16-bit 8-Channel ADC driver +* +* Author: Gregory CLEMENT <[email protected]> +* +* Datasheet: http://www.ti.com/lit/ds/symlink/ads8344.pdf +*/ + +#include <linux/delay.h> +#include <linux/iio/buffer.h> +#include <linux/iio/iio.h> +#include <linux/module.h> +#include <linux/regulator/consumer.h> +#include <linux/spi/spi.h>
drivers/iio/adc/ti-ads8344.c line 25
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +10
-0+ +#define ADS8344_START BIT(7) +#define ADS8344_SINGLE_END BIT(2) +#define ADS8344_CHANNEL (channel) ((channel) << 4) +#define ADS8344_CLOCK_INTERNAL 0x2/* PD1 = 1 and PD0 = 0 */ + +struct ads8344 { +struct spi_device *spi; +struct regulator *reg; +struct mutex lock;
This requires a comment explaining its purpose.
checkpatch issues a warning IIRC.
Quoted 68 lines
drivers/iio/adc/ti-ads8344.c new file +68
-0+ +u8 tx_buf____cacheline_aligned ; +u16 rx_buf; +}; + +#define ADS8344_VOLTAGE_CHANNEL (chan, si) \ + { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = chan, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + } + +#define ADS8344_VOLTAGE_CHANNEL_DIFF (chan1, chan2, si) \ + { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = (chan1), \ + .channel2 = (chan2), \ + .differential = 1, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + } + +static const struct iio_chan_spec ads8344_channels[] = { +ADS8344_VOLTAGE_CHANNEL (0 ,0 ), +ADS8344_VOLTAGE_CHANNEL (1 ,4 ), +ADS8344_VOLTAGE_CHANNEL (2 ,1 ), +ADS8344_VOLTAGE_CHANNEL (3 ,5 ), +ADS8344_VOLTAGE_CHANNEL (4 ,2 ), +ADS8344_VOLTAGE_CHANNEL (5 ,6 ), +ADS8344_VOLTAGE_CHANNEL (6 ,3 ), +ADS8344_VOLTAGE_CHANNEL (7 ,7 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (0 ,1 ,8 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (2 ,3 ,9 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (4 ,5 ,10 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (6 ,7 ,11 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (1 ,0 ,12 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (3 ,2 ,13 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (5 ,4 ,14 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (7 ,6 ,15 ), +}; + +static int ads8344_adc_conversion (struct ads8344 *adc,int channel, +bool differential) +{ +struct spi_device *spi = adc->spi; +int ret; + + adc->tx_buf =ADS8344_START ; +if (!differential) + adc->tx_buf |=ADS8344_SINGLE_END ; + adc->tx_buf |=ADS8344_CHANNEL (channel); + adc->tx_buf |=ADS8344_CLOCK_INTERNAL ; + + ret =spi_write (spi, &adc->tx_buf,1 ); +if (ret) +return ret; + +udelay (9 ); + + ret =spi_read (spi, &adc->rx_buf,2 ); +if (ret) +return ret; + +return adc->rx_buf; +}
drivers/iio/adc/ti-ads8344.c line 103
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +10
-0+ +static int ads8344_read_raw (struct iio_dev *iio, +struct iio_chan_spec const *channel,int *value, +int *shift,long mask) +{ +struct ads8344 *adc =iio_priv (iio); + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&adc->lock);
Just curious:
What would happen if you don't lock ?
I'm interested in looking for whatever happens in such a case and how to exploit it ?
Also, bus transactions are often atomic using their locking/unlocking procedures. So, why do we need locking procedures in iio drivers itself ?
Quoted 53 lines
drivers/iio/adc/ti-ads8344.c new file +53
-0+ *value =ads8344_adc_conversion (adc, channel->scan_index, + channel->differential); +mutex_unlock (&adc->lock); +if (*value <0 ) +return *value; + +return IIO_VAL_INT ; +case IIO_CHAN_INFO_SCALE : + *value =regulator_get_voltage (adc->reg); +if (*value <0 ) +return *value; + +/* convert regulator output voltage to mV */ + *value /=1000 ; + *shift =16 ; + +return IIO_VAL_FRACTIONAL_LOG2 ; +default : +return -EINVAL ; + } +} + +static const struct iio_info ads8344_info = { + .read_raw = ads8344_read_raw, +}; + +static int ads8344_probe (struct spi_device *spi) +{ +struct iio_dev *indio_dev; +struct ads8344 *adc; +int ret; + + indio_dev =devm_iio_device_alloc (&spi->dev,sizeof (*adc)); +if (!indio_dev) +return -ENOMEM ; + + adc =iio_priv (indio_dev); + adc->spi = spi; +mutex_init (&adc->lock); + + indio_dev->name =dev_name (&spi->dev); + indio_dev->dev.parent = &spi->dev; + indio_dev->dev.of_node = spi->dev.of_node; + indio_dev->info = &ads8344_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->channels = ads8344_channels; + indio_dev->num_channels =ARRAY_SIZE (ads8344_channels); + + adc->reg =devm_regulator_get (&spi->dev,"vref" ); +if (IS_ERR (adc->reg)) +return PTR_ERR (adc->reg); + + ret =regulator_enable (adc->reg);
drivers/iio/adc/ti-ads8344.c line 166
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +10
-0+if (ret) +return ret; + +spi_set_drvdata (spi, indio_dev); + + ret =iio_device_register (indio_dev); +if (ret) { +regulator_disable (adc->reg); +return ret; + }
IDK but it is advised not to mix devm_* with regular functions.
If there is any possibilty to use devm_add_action_or_reset here ?
This would help get rid of ads8344_remove and help smooth unwinding in failure w/o any race.
Quoted 25 lines
drivers/iio/adc/ti-ads8344.c new file +25
-0+return 0 ; +} + +static int ads8344_remove (struct spi_device *spi) +{ +struct iio_dev *indio_dev =spi_get_drvdata (spi); +struct ads8344 *adc =iio_priv (indio_dev); + +iio_device_unregister (indio_dev); +regulator_disable (adc->reg); + +return 0 ; +} + +static const struct of_device_id ads8344_of_match[] = { + { .compatible ="ti,ads8344" , }, + {} +}; +MODULE_DEVICE_TABLE (of, ads8344_dt_ids); + +static struct spi_driver ads8344_driver = { + .driver = { + .name ="ads8344" , + .of_match_table = ads8344_of_match, + },
drivers/iio/adc/ti-ads8344.c line 200
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +8
-0+ .probe = ads8344_probe, + .remove = ads8344_remove, +}; +module_spi_driver (ads8344_driver); + +MODULE_AUTHOR ("Gregory CLEMENT <[email protected]>" ); +MODULE_DESCRIPTION ("ADS8344 driver" ); +MODULE_LICENSE ("GPL v2" );
this is a mismatch.
Signature · 4 lines
Himanshu Jha Undergraduate Student Department of Electronics & Communication Guru Tegh Bahadur Institute of Technology
Jonathan Cameron
maintainerRe: [PATCH v2 2/2] iio: adc: Add driver for the TI ADS8344 A/DC chips
Quoted 5 lines · On Sun, 24 Mar 2019 20:46:25 +0530 Himanshu Jha <[email protected]>…
Quoted 4 lines · Gregory CLEMENT
This adds support for the Texas Instruments ADS8344 ADC chip. This chip has a 16-bit 8-Channel ADC and is access directly through SPI.
Signed-off-by Gregory CLEMENT <[email protected]>
Hi Gregory / Himanshu,
Comments inline, though mostly addressing Himanshu's questions as I was here ;)
I'm happy with the code, though up to you if you want to look at taking everything to device managed allocators.
Just the license issue that is stopping me applying this.
Jonathan
Quoted 41 lines
Quoted 41 lines
--- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ti-ads8344.c | 200 +++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 drivers/iio/adc/ti-ads8344.cdrivers/iio/adc/Kconfig +10
-0@@ -967,6 +967,16 @@ config TI_ADS7950 To compile this driver as a module, choose M here: the module will be called ti-ads7950. +config TI_ADS8344 + tristate "Texas Instruments ADS8344" + depends on SPI && OF + help + If you say yes here you get support for Texas Instruments ADS8344 + ADC chips + + This driver can also be built as a module. If so, the module will be + called ti-ads8344. + config TI_ADS8688 tristate "Texas Instruments ADS8688" depends on SPI && OFdrivers/iio/adc/Makefile +1
-0@@ -87,6 +87,7 @@ obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o obj-$(CONFIG_TI_ADS7950) += ti-ads7950.o +obj-$(CONFIG_TI_ADS8344) += ti-ads8344.o obj-$(CONFIG_TI_ADS8688) += ti-ads8688.o obj-$(CONFIG_TI_ADS124S08) += ti-ads124s08.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.odrivers/iio/adc/ti-ads8344.c +0
-0
Quoted 9 lines
drivers/iio/adc/ti-ads8344.c line 1
Quoted 6 lines
new file mode 100644
index 000000000000..649ed05bf1c9drivers/iio/adc/ti-ads8344.c new file +1
-0@@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0+ Inconsistency in License.
Good spot. That alone means we are going to need a v3.
Quoted 19 lines
Quoted 19 lines
drivers/iio/adc/ti-ads8344.c new file +18
-0+* ADS8344 16-bit 8-Channel ADC driver +* +* Author: Gregory CLEMENT <[email protected]> +* +* Datasheet: http://www.ti.com/lit/ds/symlink/ads8344.pdf +*/ + +#include <linux/delay.h> +#include <linux/iio/buffer.h> +#include <linux/iio/iio.h> +#include <linux/module.h> +#include <linux/regulator/consumer.h> +#include <linux/spi/spi.h> + +#define ADS8344_START BIT(7) +#define ADS8344_SINGLE_END BIT(2) +#define ADS8344_CHANNEL (channel) ((channel) << 4) +#define ADS8344_CLOCK_INTERNAL 0x2/* PD1 = 1 and PD0 = 0 */
Quoted 8 lines
drivers/iio/adc/ti-ads8344.c line 25
Quoted 5 lines
drivers/iio/adc/ti-ads8344.c new file +5
-0+ +struct ads8344 { +struct spi_device *spi; +struct regulator *reg; +struct mutex lock;This requires a comment explaining its purpose.
checkpatch issues a warning IIRC.
In this particular case that might have answered the question you have below!
Quoted 74 lines
Quoted 74 lines
drivers/iio/adc/ti-ads8344.c new file +73
-0+ +u8 tx_buf____cacheline_aligned ; +u16 rx_buf; +}; + +#define ADS8344_VOLTAGE_CHANNEL (chan, si) \ + { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = chan, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + } + +#define ADS8344_VOLTAGE_CHANNEL_DIFF (chan1, chan2, si) \ + { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = (chan1), \ + .channel2 = (chan2), \ + .differential = 1, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + } + +static const struct iio_chan_spec ads8344_channels[] = { +ADS8344_VOLTAGE_CHANNEL (0 ,0 ), +ADS8344_VOLTAGE_CHANNEL (1 ,4 ), +ADS8344_VOLTAGE_CHANNEL (2 ,1 ), +ADS8344_VOLTAGE_CHANNEL (3 ,5 ), +ADS8344_VOLTAGE_CHANNEL (4 ,2 ), +ADS8344_VOLTAGE_CHANNEL (5 ,6 ), +ADS8344_VOLTAGE_CHANNEL (6 ,3 ), +ADS8344_VOLTAGE_CHANNEL (7 ,7 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (0 ,1 ,8 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (2 ,3 ,9 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (4 ,5 ,10 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (6 ,7 ,11 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (1 ,0 ,12 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (3 ,2 ,13 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (5 ,4 ,14 ), +ADS8344_VOLTAGE_CHANNEL_DIFF (7 ,6 ,15 ), +}; + +static int ads8344_adc_conversion (struct ads8344 *adc,int channel, +bool differential) +{ +struct spi_device *spi = adc->spi; +int ret; + + adc->tx_buf =ADS8344_START ; +if (!differential) + adc->tx_buf |=ADS8344_SINGLE_END ; + adc->tx_buf |=ADS8344_CHANNEL (channel); + adc->tx_buf |=ADS8344_CLOCK_INTERNAL ; + + ret =spi_write (spi, &adc->tx_buf,1 ); +if (ret) +return ret; + +udelay (9 ); + + ret =spi_read (spi, &adc->rx_buf,2 ); +if (ret) +return ret; + +return adc->rx_buf; +} + +static int ads8344_read_raw (struct iio_dev *iio, +struct iio_chan_spec const *channel,int *value, +int *shift,long mask) +{
Quoted 8 lines
drivers/iio/adc/ti-ads8344.c line 103
Quoted 5 lines
drivers/iio/adc/ti-ads8344.c new file +5
-0+struct ads8344 *adc =iio_priv (iio); + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&adc->lock);Just curious:
What would happen if you don't lock ?
Well as I'm here I'll answer. Key here is that there is nothing stopping two concurrent reads of a sysfs file. In this particular case the lock is protecting adc->tx_buff and rx_buff.
As a simple example, imagine two calls are reading different channels. As they can race, it's possible both reads occur such that we either do two bus reads with the same channel set, or we end up doing one read after the other, but both functions end up using the same buffer contents. Upshot is that we end up reading the wrong channel.
Quoted 6 lines
I'm interested in looking for whatever happens in such a case and how to exploit it ?
Also, bus transactions are often atomic using their locking/unlocking procedures. So, why do we need locking procedures in iio drivers itself ?
Yes, this could be avoided, but only at the cost of separate buffers, made tricky by the dma alignment requirements that mean we can't use them off the stack. One option would be to use spi_write_then_read, which uses the SPI bus locking + some local buffers thus avoiding the problem. However the need to have a sleep between them stops that option.
You can think of it as the bus locks prevent multiple users of the bus (which may be different drivers) and the IIO locks prevent multiple users of IIO device instance specific data. Hence there is no nice way to do it with a single lock as they have different / overlapping scopes.
Quoted 67 lines
Quoted 54 lines
drivers/iio/adc/ti-ads8344.c new file +53
-0+ *value =ads8344_adc_conversion (adc, channel->scan_index, + channel->differential); +mutex_unlock (&adc->lock); +if (*value <0 ) +return *value; + +return IIO_VAL_INT ; +case IIO_CHAN_INFO_SCALE : + *value =regulator_get_voltage (adc->reg); +if (*value <0 ) +return *value; + +/* convert regulator output voltage to mV */ + *value /=1000 ; + *shift =16 ; + +return IIO_VAL_FRACTIONAL_LOG2 ; +default : +return -EINVAL ; + } +} + +static const struct iio_info ads8344_info = { + .read_raw = ads8344_read_raw, +}; + +static int ads8344_probe (struct spi_device *spi) +{ +struct iio_dev *indio_dev; +struct ads8344 *adc; +int ret; + + indio_dev =devm_iio_device_alloc (&spi->dev,sizeof (*adc)); +if (!indio_dev) +return -ENOMEM ; + + adc =iio_priv (indio_dev); + adc->spi = spi; +mutex_init (&adc->lock); + + indio_dev->name =dev_name (&spi->dev); + indio_dev->dev.parent = &spi->dev; + indio_dev->dev.of_node = spi->dev.of_node; + indio_dev->info = &ads8344_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->channels = ads8344_channels; + indio_dev->num_channels =ARRAY_SIZE (ads8344_channels); + + adc->reg =devm_regulator_get (&spi->dev,"vref" ); +if (IS_ERR (adc->reg)) +return PTR_ERR (adc->reg); + + ret =regulator_enable (adc->reg);drivers/iio/adc/ti-ads8344.c line 166
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +10
-0+if (ret) +return ret; + +spi_set_drvdata (spi, indio_dev); + + ret =iio_device_register (indio_dev); +if (ret) { +regulator_disable (adc->reg); +return ret; + }IDK but it is advised not to mix devm_* with regular functions.
Quoted 4 lines
If there is any possibilty to use
devm_add_action_or_resethere ?This would help get rid of
ads8344_removeand help smooth unwinding in failure w/o any race.
There is no problem as long as you keep in mind that devm_ unwinding occurs after remove occurs. That means that, to maintain ordering of remove being the opposite of probe, once you hit something that needs unwinding manually, you should use the none devm functions for everything after it.
Hence I think what we have here is correct. The devm_add_action_or_reset might be worthwhile to avoid the need to manually unwind anything at all though.
Quoted 40 lines
Quoted 26 lines
drivers/iio/adc/ti-ads8344.c new file +25
-0+return 0 ; +} + +static int ads8344_remove (struct spi_device *spi) +{ +struct iio_dev *indio_dev =spi_get_drvdata (spi); +struct ads8344 *adc =iio_priv (indio_dev); + +iio_device_unregister (indio_dev); +regulator_disable (adc->reg); + +return 0 ; +} + +static const struct of_device_id ads8344_of_match[] = { + { .compatible ="ti,ads8344" , }, + {} +}; +MODULE_DEVICE_TABLE (of, ads8344_dt_ids); + +static struct spi_driver ads8344_driver = { + .driver = { + .name ="ads8344" , + .of_match_table = ads8344_of_match, + },drivers/iio/adc/ti-ads8344.c line 200
Quoted 10 lines
drivers/iio/adc/ti-ads8344.c new file +8
-0+ .probe = ads8344_probe, + .remove = ads8344_remove, +}; +module_spi_driver (ads8344_driver); + +MODULE_AUTHOR ("Gregory CLEMENT <[email protected]>" ); +MODULE_DESCRIPTION ("ADS8344 driver" ); +MODULE_LICENSE ("GPL v2" );this is a mismatch.