Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9cd105 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman
Browse files

staging: iio: dac: Use spi_write() and handle return value 



Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51f8ad36

drivers/staging/iio/dac/ad5624r_spi.c

+7 −16
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ struct ad5624r_state { 
	int internal_ref;

};



static int ad5624r_spi_write(struct spi_device *spi, u8 cmd, u8 addr, u16 val, u8 len)

static int ad5624r_spi_write(struct spi_device *spi,

			     u8 cmd, u8 addr, u16 val, u8 len)

{

	struct spi_transfer t;

	struct spi_message m;

	u32 data;

	u8 msg[3];
@@ -54,15 +53,7 @@ static int ad5624r_spi_write(struct spi_device *spi, u8 cmd, u8 addr, u16 val, u 
	msg[1] = data >> 8;

	msg[2] = data;



	spi_message_init(&m);

	memset(&t, 0, (sizeof t));

	t.tx_buf = &msg[0];

	t.len = 3;



	spi_message_add_tail(&t, &m);

	spi_sync(spi, &m);



	return len;

	return spi_write(spi, msg, 3);

}



static ssize_t ad5624r_write_dac(struct device *dev,
@@ -80,7 +71,7 @@ static ssize_t ad5624r_write_dac(struct device *dev, 
	if (ret)

		return ret;



	ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,

	ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,

			this_attr->address, readin, st->data_len);

	return ret ? ret : len;

}
@@ -109,7 +100,7 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev, 
	if (ret)

		return ret;



	ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0, readin & 0xF, 16);

	ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0, readin & 0xF, 16);

	st->ldac_mode = readin & 0xF;



	return ret ? ret : len;
@@ -141,7 +132,7 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev, 
	if (ret)

		return ret;



	ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,

	ret = ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,

			((readin & 0x3) << 4) | (1 << this_attr->address), 16);



	st->dac_power_mode[this_attr->address] = readin & 0x3;
@@ -173,7 +164,7 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev, 
	if (ret)

		return ret;



	ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0, !!readin, 16);

	ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0, !!readin, 16);



	st->internal_ref = !!readin;