Commit 9cac0a02 authored by Miquel Raynal's avatar Miquel Raynal Committed by Lee Jones
Browse files

iio: adc: ti_am335x_adc: Fix style 



These warnings are reported by checkpatch.pl essentially.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211015081506.933180-41-miquel.raynal@bootlin.com
parent aaf71200

drivers/iio/adc/ti_am335x_adc.c

+52 −52
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ static void tiadc_step_config(struct iio_dev *indio_dev) 
	 * Channel would represent which analog input

	 * needs to be given to ADC to digitalize data.

	 */





	for (i = 0; i < adc_dev->channels; i++) {

		int chan;
@@ -134,8 +132,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev) 
		}



		if (adc_dev->step_avg[i])

			stepconfig =

			STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1) |

			stepconfig = STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1) |

				     STEPCONFIG_FIFO1;

		else

			stepconfig = STEPCONFIG_FIFO1;
@@ -145,8 +142,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev) 


		tiadc_writel(adc_dev, REG_STEPCONFIG(steps),

			     stepconfig | STEPCONFIG_INP(chan) |

				STEPCONFIG_INM_ADCREFM |

				STEPCONFIG_RFP_VREFP |

			     STEPCONFIG_INM_ADCREFM | STEPCONFIG_RFP_VREFP |

			     STEPCONFIG_RFM_VREFN);



		if (adc_dev->open_delay[i] > STEPCONFIG_MAX_OPENDLY) {
@@ -188,10 +184,12 @@ static irqreturn_t tiadc_irq_h(int irq, void *private) 
		config = tiadc_readl(adc_dev, REG_CTRL);

		config &= ~(CNTRLREG_SSENB);

		tiadc_writel(adc_dev, REG_CTRL, config);

		tiadc_writel(adc_dev, REG_IRQSTATUS, IRQENB_FIFO1OVRRUN

				| IRQENB_FIFO1UNDRFLW | IRQENB_FIFO1THRES);

		tiadc_writel(adc_dev, REG_IRQSTATUS,

			     IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW |

			     IRQENB_FIFO1THRES);



		/* wait for idle state.

		/*

		 * Wait for the idle state.

		 * ADC needs to finish the current conversion

		 * before disabling the module

		 */
@@ -219,7 +217,7 @@ static irqreturn_t tiadc_worker_h(int irq, void *private) 


	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);

	for (k = 0; k < fifo1count; k = k + i) {

		for (i = 0; i < (indio_dev->scan_bytes)/2; i++) {

		for (i = 0; i < indio_dev->scan_bytes / 2; i++) {

			read = tiadc_readl(adc_dev, REG_FIFO1);

			data[i] = read & FIFOREAD_DATA_MASK;

		}
@@ -256,6 +254,7 @@ static int tiadc_start_dma(struct iio_dev *indio_dev) 
	struct dma_async_tx_descriptor *desc;



	dma->current_period = 0; /* We start to fill period 0 */



	/*

	 * Make the fifo thresh as the multiple of total number of

	 * channels enabled, so make sure that cyclic DMA period
@@ -265,6 +264,7 @@ static int tiadc_start_dma(struct iio_dev *indio_dev) 
	 */

	dma->fifo_thresh = rounddown(FIFO1_THRESHOLD + 1,

				     adc_dev->total_ch_enabled) - 1;



	/* Make sure that period length is multiple of fifo thresh level */

	dma->period_size = rounddown(DMA_BUFFER_SIZE / 2,

				     (dma->fifo_thresh + 1) * sizeof(u16));
@@ -303,9 +303,9 @@ static int tiadc_buffer_preenable(struct iio_dev *indio_dev) 
	if (ret)

		return ret;



	tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |

				IRQENB_FIFO1OVRRUN |

				IRQENB_FIFO1UNDRFLW));

	tiadc_writel(adc_dev, REG_IRQCLR,

		     IRQENB_FIFO1THRES | IRQENB_FIFO1OVRRUN |

		     IRQENB_FIFO1UNDRFLW);



	/* Flush FIFO. Needed in corner cases in simultaneous tsc/adc use */

	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
@@ -335,8 +335,9 @@ static int tiadc_buffer_postenable(struct iio_dev *indio_dev) 


	am335x_tsc_se_set_cache(adc_dev->mfd_tscadc, enb);



	tiadc_writel(adc_dev,  REG_IRQSTATUS, IRQENB_FIFO1THRES

				| IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW);

	tiadc_writel(adc_dev, REG_IRQSTATUS,

		     IRQENB_FIFO1THRES | IRQENB_FIFO1OVRRUN |

		     IRQENB_FIFO1UNDRFLW);



	irq_enable = IRQENB_FIFO1OVRRUN;

	if (!dma->chan)
@@ -352,8 +353,9 @@ static int tiadc_buffer_predisable(struct iio_dev *indio_dev) 
	struct tiadc_dma *dma = &adc_dev->dma;

	int fifo1count, i;



	tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |

				IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW));

	tiadc_writel(adc_dev, REG_IRQCLR,

		     IRQENB_FIFO1THRES | IRQENB_FIFO1OVRRUN |

		     IRQENB_FIFO1UNDRFLW);

	am335x_tsc_se_clr(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps);

	adc_dev->buffer_en_ch_steps = 0;

	adc_dev->total_ch_enabled = 0;
@@ -388,8 +390,7 @@ static int tiadc_iio_buffered_hardware_setup(struct device *dev, 
					     struct iio_dev *indio_dev,

					     irqreturn_t (*pollfunc_bh)(int irq, void *p),

					     irqreturn_t (*pollfunc_th)(int irq, void *p),

	int irq,

	unsigned long flags,

					     int irq, unsigned long flags,

					     const struct iio_buffer_setup_ops *setup_ops)

{

	int ret;
@@ -426,12 +427,11 @@ static int tiadc_channel_init(struct device *dev, struct iio_dev *indio_dev, 
	indio_dev->num_channels = channels;

	chan_array = devm_kcalloc(dev, channels, sizeof(*chan_array),

				  GFP_KERNEL);

	if (chan_array == NULL)

	if (!chan_array)

		return -ENOMEM;



	chan = chan_array;

	for (i = 0; i < channels; i++, chan++) {



		chan->type = IIO_VOLTAGE;

		chan->indexed = 1;

		chan->channel = adc_dev->channel_line[i];
@@ -449,8 +449,8 @@ static int tiadc_channel_init(struct device *dev, struct iio_dev *indio_dev, 
}



static int tiadc_read_raw(struct iio_dev *indio_dev,

		struct iio_chan_spec const *chan,

		int *val, int *val2, long mask)

			  struct iio_chan_spec const *chan, int *val, int *val2,

			  long mask)

{

	struct tiadc_device *adc_dev = iio_priv(indio_dev);

	int i, map_val;
@@ -479,9 +479,8 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, 


	am335x_tsc_se_set_once(adc_dev->mfd_tscadc, step_en);



	timeout = jiffies + msecs_to_jiffies

				(IDLE_TIMEOUT * adc_dev->channels);

	/* Wait for Fifo threshold interrupt */

	timeout = jiffies + msecs_to_jiffies(IDLE_TIMEOUT * adc_dev->channels);

	while (1) {

		fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);

		if (fifo1count)
@@ -493,6 +492,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, 
			goto err_unlock;

		}

	}



	map_val = adc_dev->channel_step[chan->scan_index];



	/*
@@ -513,6 +513,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, 
			*val = (u16)read;

		}

	}



	am335x_tsc_se_adc_done(adc_dev->mfd_tscadc);



	if (!found)
@@ -557,6 +558,7 @@ static int tiadc_request_dma(struct platform_device *pdev, 
		goto err;



	return 0;



err:

	dma_release_channel(dma->chan);

	return -ENOMEM;
@@ -606,7 +608,7 @@ static int tiadc_probe(struct platform_device *pdev) 
	}



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));

	if (indio_dev == NULL) {

	if (!indio_dev) {

		dev_err(&pdev->dev, "failed to allocate iio device\n");

		return -ENOMEM;

	}
@@ -633,7 +635,6 @@ static int tiadc_probe(struct platform_device *pdev) 
						adc_dev->mfd_tscadc->irq,

						IRQF_SHARED,

						&tiadc_buffer_setup_ops);



	if (err)

		goto err_free_channels;
@@ -684,8 +685,7 @@ static int __maybe_unused tiadc_suspend(struct device *dev) 


	idle = tiadc_readl(adc_dev, REG_CTRL);

	idle &= ~(CNTRLREG_SSENB);

	tiadc_writel(adc_dev, REG_CTRL, (idle |

			CNTRLREG_POWERDOWN));

	tiadc_writel(adc_dev, REG_CTRL, idle | CNTRLREG_POWERDOWN);



	return 0;

}
@@ -698,7 +698,7 @@ static int __maybe_unused tiadc_resume(struct device *dev) 


	/* Make sure ADC is powered up */

	restore = tiadc_readl(adc_dev, REG_CTRL);

	restore &= ~(CNTRLREG_POWERDOWN);

	restore &= ~CNTRLREG_POWERDOWN;

	tiadc_writel(adc_dev, REG_CTRL, restore);



	tiadc_step_config(indio_dev);