Commit 8f261041 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging/iio fixes from Greg KH:
 "Here are some small staging and IIO driver fixes for 5.7-rc7

  Nothing major, just a collection of IIO driver fixes for reported
  issues, and a few small staging driver fixes that people have found.
  Full details are in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: wfx: unlock on error path
  staging: greybus: Fix uninitialized scalar variable
  staging: kpc2000: fix error return code in kp2000_pcie_probe()
  iio: sca3000: Remove an erroneous 'get_device()'
  iio: adc: stm32-dfsdm: fix device used to request dma
  iio: adc: stm32-adc: fix device used to request dma
  iio: adc: ti-ads8344: Fix channel selection
  staging: iio: ad2s1210: Fix SPI reading
  iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()'
  iio: imu: st_lsm6dsx: unlock on error in st_lsm6dsx_shub_write_raw()
  iio: chemical: atlas-sensor: correct DO-SM channels
parents d3044d7d bcb39287

drivers/iio/accel/sca3000.c

+1 −1
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ static int sca3000_read_data(struct sca3000_state *st, 
	st->tx[0] = SCA3000_READ_REG(reg_address_high);

	ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));

	if (ret) {

		dev_err(get_device(&st->us->dev), "problem reading register");

		dev_err(&st->us->dev, "problem reading register\n");

		return ret;

	}

drivers/iio/adc/stm32-adc.c

+4 −4
Original line number Diff line number Diff line
@@ -1812,18 +1812,18 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) 
	return 0;

}



static int stm32_adc_dma_request(struct iio_dev *indio_dev)

static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)

{

	struct stm32_adc *adc = iio_priv(indio_dev);

	struct dma_slave_config config;

	int ret;



	adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");

	adc->dma_chan = dma_request_chan(dev, "rx");

	if (IS_ERR(adc->dma_chan)) {

		ret = PTR_ERR(adc->dma_chan);

		if (ret != -ENODEV) {

			if (ret != -EPROBE_DEFER)

				dev_err(&indio_dev->dev,

				dev_err(dev,

					"DMA channel request failed with %d\n",

					ret);

			return ret;
@@ -1930,7 +1930,7 @@ static int stm32_adc_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	ret = stm32_adc_dma_request(indio_dev);

	ret = stm32_adc_dma_request(dev, indio_dev);

	if (ret < 0)

		return ret;

drivers/iio/adc/stm32-dfsdm-adc.c

+11 −10
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ enum sd_converter_type { 


struct stm32_dfsdm_dev_data {

	int type;

	int (*init)(struct iio_dev *indio_dev);

	int (*init)(struct device *dev, struct iio_dev *indio_dev);

	unsigned int num_channels;

	const struct regmap_config *regmap_cfg;

};
@@ -1365,11 +1365,12 @@ static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev) 
	}

}



static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev)

static int stm32_dfsdm_dma_request(struct device *dev,

				   struct iio_dev *indio_dev)

{

	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);



	adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");

	adc->dma_chan = dma_request_chan(dev, "rx");

	if (IS_ERR(adc->dma_chan)) {

		int ret = PTR_ERR(adc->dma_chan);
@@ -1425,7 +1426,7 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev, 
					  &adc->dfsdm->ch_list[ch->channel]);

}



static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev)

static int stm32_dfsdm_audio_init(struct device *dev, struct iio_dev *indio_dev)

{

	struct iio_chan_spec *ch;

	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
@@ -1452,10 +1453,10 @@ static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev) 
	indio_dev->num_channels = 1;

	indio_dev->channels = ch;



	return stm32_dfsdm_dma_request(indio_dev);

	return stm32_dfsdm_dma_request(dev, indio_dev);

}



static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev)

static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)

{

	struct iio_chan_spec *ch;

	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
@@ -1499,17 +1500,17 @@ static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev) 
	init_completion(&adc->completion);



	/* Optionally request DMA */

	ret = stm32_dfsdm_dma_request(indio_dev);

	ret = stm32_dfsdm_dma_request(dev, indio_dev);

	if (ret) {

		if (ret != -ENODEV) {

			if (ret != -EPROBE_DEFER)

				dev_err(&indio_dev->dev,

				dev_err(dev,

					"DMA channel request failed with %d\n",

					ret);

			return ret;

		}



		dev_dbg(&indio_dev->dev, "No DMA support\n");

		dev_dbg(dev, "No DMA support\n");

		return 0;

	}
@@ -1622,7 +1623,7 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) 
		adc->dfsdm->fl_list[adc->fl_id].sync_mode = val;



	adc->dev_data = dev_data;

	ret = dev_data->init(iio);

	ret = dev_data->init(dev, iio);

	if (ret < 0)

		return ret;

drivers/iio/adc/ti-ads8344.c

+5 −3
Original line number Diff line number Diff line
@@ -32,16 +32,17 @@ struct ads8344 { 
	u8 rx_buf[3];

};



#define ADS8344_VOLTAGE_CHANNEL(chan, si)				\

#define ADS8344_VOLTAGE_CHANNEL(chan, addr)				\

	{								\

		.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),	\

		.address = addr,					\

	}



#define ADS8344_VOLTAGE_CHANNEL_DIFF(chan1, chan2, si)			\

#define ADS8344_VOLTAGE_CHANNEL_DIFF(chan1, chan2, addr)		\

	{								\

		.type = IIO_VOLTAGE,					\

		.indexed = 1,						\
@@ -50,6 +51,7 @@ struct ads8344 { 
		.differential = 1,					\

		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\

		.address = addr,					\

	}



static const struct iio_chan_spec ads8344_channels[] = {
@@ -105,7 +107,7 @@ static int ads8344_read_raw(struct iio_dev *iio, 
	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		mutex_lock(&adc->lock);

		*value = ads8344_adc_conversion(adc, channel->scan_index,

		*value = ads8344_adc_conversion(adc, channel->address,

						channel->differential);

		mutex_unlock(&adc->lock);

		if (*value < 0)

drivers/iio/chemical/atlas-sensor.c

+13 −1
Original line number Diff line number Diff line
@@ -194,7 +194,19 @@ static const struct iio_chan_spec atlas_orp_channels[] = { 
};



static const struct iio_chan_spec atlas_do_channels[] = {

	ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),

	{

		.type = IIO_CONCENTRATION,

		.address = ATLAS_REG_DO_DATA,

		.info_mask_separate =

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

		.scan_index = 0,

		.scan_type = {

			.sign = 'u',

			.realbits = 32,

			.storagebits = 32,

			.endianness = IIO_BE,

		},

	},

	IIO_CHAN_SOFT_TIMESTAMP(1),

	{

		.type = IIO_TEMP,

CRA Git | Maintained and supported by SUSTech CRA and CCSE