diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 09:58:02 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 09:58:02 -0800 |
commit | ad463ac42771a0bb8a706cf8a985788fe5f5c1c6 (patch) | |
tree | d8585ea49108c4d73af97b75b3ffdc0d094b68ee /drivers/staging/iio/frequency/ad9850.c | |
parent | 5305d746054d1c73e7e9263b25189dedefb2dc01 (diff) | |
parent | 09a642b78523e9f4c5970c806ad218aa3de31551 (diff) | |
download | kernel_goldelico_gta04-ad463ac42771a0bb8a706cf8a985788fe5f5c1c6.zip kernel_goldelico_gta04-ad463ac42771a0bb8a706cf8a985788fe5f5c1c6.tar.gz kernel_goldelico_gta04-ad463ac42771a0bb8a706cf8a985788fe5f5c1c6.tar.bz2 |
Merge tag 'iio-for-3.9d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
"4th set of IIO new drivers cleanups and fixes for the 3.9 cycle
+ a new spi helper function.
1) Introduce spi_sync_transfer and use it within IIO. Originally
it was envisioned that this nice little boilerplate replacement
would go through the spi tree, but Grant Likely stated he'd
prefer we take it through IIO as the example usecases were all
in IIO (and are also in this pull request). Note that given
their may have been some unresolved elements related to the
coccinelle element of the patch, that has been stripped out
and will doubtlessly follow at a later date (along with
lots of other patches for drivers elsewhere in the tree).
2) New Invensense MPU6050 driver. This is stripped down to pretty
much the basics from the original submission with the intent
to build up all the fancy bits in an incremental (and hence
reviewable fashion). It's been through a good few revisions
so nice to finally merge this.
3) Change to iio_channel_get api to simplify device tree based
mappings. The actual mappings are currently under review.
4) Build fixes for !CONFIG_IIO_TRIGGER in the st_sensors driver.
This one snuck past during review and testing but got picked
up by Randy Dunlap in a randconfig build.
5) Some max1363 cleanups and enhancements.
6) Some comment fixes to make them coherent and comprehensible.
7) Trivial build warning fix in mxs-lradc"
Diffstat (limited to 'drivers/staging/iio/frequency/ad9850.c')
-rw-r--r-- | drivers/staging/iio/frequency/ad9850.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/iio/frequency/ad9850.c b/drivers/staging/iio/frequency/ad9850.c index 104f7a4..01a8a93 100644 --- a/drivers/staging/iio/frequency/ad9850.c +++ b/drivers/staging/iio/frequency/ad9850.c @@ -39,7 +39,6 @@ static ssize_t ad9850_set_parameter(struct device *dev, const char *buf, size_t len) { - struct spi_message msg; struct spi_transfer xfer; int ret; struct ad9850_config *config = (struct ad9850_config *)buf; @@ -50,9 +49,7 @@ static ssize_t ad9850_set_parameter(struct device *dev, xfer.tx_buf = config; mutex_lock(&st->lock); - spi_message_init(&msg); - spi_message_add_tail(&xfer, &msg); - ret = spi_sync(st->sdev, &msg); + ret = spi_sync_transfer(st->sdev, &xfer, 1); if (ret) goto error_ret; error_ret: |