Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio: accel: kxsd9: Do away with the write2 helper

Browse Source 
This is just a masquerading register write function, so use the
register write function instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Linus Walleij 2016-09-01 11:44:39 +02:00 committed by Jonathan Cameron
parent bf96f6e80c
commit ab04f734b0
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/accel/kxsd9-spi.c
View File

@ -25,15 +25,6 @@ static int kxsd9_spi_writereg(struct kxsd9_transport *tr, u8 address, u8 val)
return spi_write(spi, tr->tx, 2);
}
static int kxsd9_spi_write2(struct kxsd9_transport *tr, u8 b1, u8 b2)
{
struct spi_device *spi = tr->trdev;
tr->tx[0] = b1;
tr->tx[1] = b2;
return spi_write(spi, tr->tx, 2);
}
static int kxsd9_spi_readval(struct kxsd9_transport *tr, u8 address)
{
struct spi_device *spi = tr->trdev;
@ -70,7 +61,6 @@ static int kxsd9_spi_probe(struct spi_device *spi)
transport->trdev = spi;
transport->readreg = kxsd9_spi_readreg;
transport->writereg = kxsd9_spi_writereg;
transport->write2 = kxsd9_spi_write2;
transport->readval = kxsd9_spi_readval;
spi->mode = SPI_MODE_0;
spi_setup(spi);

4
drivers/iio/accel/kxsd9.c
View File

@ -184,10 +184,10 @@ static int kxsd9_power_up(struct kxsd9_state *st)
{
int ret;
ret = st->transport->write2(st->transport, 0x0d, 0x40);
ret = st->transport->writereg(st->transport, KXSD9_REG_CTRL_B, 0x40);
if (ret)
return ret;
return st->transport->write2(st->transport, 0x0c, 0x9b);
return st->transport->writereg(st->transport, KXSD9_REG_CTRL_C, 0x9b);
};
static const struct iio_info kxsd9_info = {

2
drivers/iio/accel/kxsd9.h
View File

@ -11,7 +11,6 @@ struct kxsd9_transport;
* @trdev: transport device such as SPI or I2C
* @readreg(): function to read a byte from an address in the device
* @writereg(): function to write a byte to an address in the device
* @write2(): function to write two consecutive bytes to the device
* @readval(): function to read a 16bit value from the device
* @rx: cache aligned read buffer
* @tx: cache aligned write buffer
@ -20,7 +19,6 @@ struct kxsd9_transport {
void *trdev;
int (*readreg) (struct kxsd9_transport *tr, u8 address);
int (*writereg) (struct kxsd9_transport *tr, u8 address, u8 val);
int (*write2) (struct kxsd9_transport *tr, u8 b1, u8 b2);
int (*readval) (struct kxsd9_transport *tr, u8 address);
u8 rx[KXSD9_STATE_RX_SIZE] ____cacheline_aligned;
u8 tx[KXSD9_STATE_TX_SIZE];