Commit 91b4171f authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron
Browse files

staging iio: lis3l02dq cleanup 



fixes some typos, whitespace, comments

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7c388ec1

drivers/staging/iio/accel/lis3l02dq.h

+6 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
/* Interrupt related stuff */

#define LIS3L02DQ_REG_WAKE_UP_CFG_ADDR			0x23



/* Switch from or combination fo conditions to and */

/* Switch from or combination of conditions to and */

#define LIS3L02DQ_REG_WAKE_UP_CFG_BOOLEAN_AND		0x80



/* Latch interrupt request,
@@ -123,7 +123,7 @@ 
#define LIS3L02DQ_REG_STATUS_X_NEW_DATA			0x01



/* The accelerometer readings - low and high bytes.

Form of high byte dependent on justification set in ctrl reg */

 * Form of high byte dependent on justification set in ctrl reg */

#define LIS3L02DQ_REG_OUT_X_L_ADDR			0x28

#define LIS3L02DQ_REG_OUT_X_H_ADDR			0x29

#define LIS3L02DQ_REG_OUT_Y_L_ADDR			0x2A
@@ -150,9 +150,9 @@ Form of high byte dependent on justification set in ctrl reg */ 
 * struct lis3l02dq_state - device instance specific data

 * @us:			actual spi_device

 * @trig:		data ready trigger registered with iio

 * @buf_lock:		mutex to protect tx and rx

 * @tx:			transmit buffer

 * @rx:			receive buffer

 * @buf_lock:		mutex to protect tx and rx

 **/

struct lis3l02dq_state {

	struct spi_device		*us;

drivers/staging/iio/accel/lis3l02dq_core.c

+2 −2
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi) 
		goto error_ret;

	}

	st = iio_priv(indio_dev);

	/* this is only used tor removal purposes */

	/* this is only used for removal purposes */

	spi_set_drvdata(spi, indio_dev);



	st->us = spi;

drivers/staging/iio/accel/lis3l02dq_ring.c

+14 −14
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "lis3l02dq.h"



/**

 * combine_8_to_16() utility function to munge to u8s into u16

 * combine_8_to_16() utility function to munge two u8s into u16

 **/

static inline u16 combine_8_to_16(u8 lower, u8 upper)

{
@@ -49,7 +49,7 @@ static const u8 read_all_tx_array[] = { 


/**

 * lis3l02dq_read_all() Reads all channels currently selected

 * @st:		device specific state

 * @indio_dev:	IIO device state

 * @rx_array:	(dma capable) receive array, must be at least

 *		4*number of channels

 **/
@@ -182,7 +182,7 @@ __lis3l02dq_write_data_ready_config(struct iio_dev *indio_dev, bool state) 


	/* Disable requested */

	if (!state && currentlyset) {

		/* disable the data ready signal */

		/* Disable the data ready signal */

		valold &= ~LIS3L02DQ_REG_CTRL_2_ENABLE_DATA_READY_GENERATION;



		/* The double write is to overcome a hardware bug? */
@@ -199,8 +199,8 @@ __lis3l02dq_write_data_ready_config(struct iio_dev *indio_dev, bool state) 
		st->trigger_on = false;

	/* Enable requested */

	} else if (state && !currentlyset) {

		/* if not set, enable requested */

		/* first disable all events */

		/* If not set, enable requested

		 * first disable all events */

		ret = lis3l02dq_disable_all_events(indio_dev);

		if (ret < 0)

			goto error_ret;
@@ -250,7 +250,7 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig, 
}



/**

 * lis3l02dq_trig_try_reen() try renabling irq for data rdy trigger

 * lis3l02dq_trig_try_reen() try reenabling irq for data rdy trigger

 * @trig:	the datardy trigger

 */

static int lis3l02dq_trig_try_reen(struct iio_trigger *trig)
@@ -259,8 +259,8 @@ static int lis3l02dq_trig_try_reen(struct iio_trigger *trig) 
	struct lis3l02dq_state *st = iio_priv(indio_dev);

	int i;



	/* If gpio still high (or high again) */

	/* In theory possible we will need to do this several times */

	/* If gpio still high (or high again)

	 * In theory possible we will need to do this several times */

	for (i = 0; i < 5; i++)

		if (gpio_get_value(irq_to_gpio(st->us->irq)))

			lis3l02dq_read_all(indio_dev, NULL);