diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:05:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:05:37 -0700 |
| commit | 5262f25f0983ff6f2c21e3dadcfd0c809e5aa286 (patch) | |
| tree | a80cc717cef84707d6751042b40e1307f838daf4 /drivers | |
| parent | acd53127c4adbd34570b221e7ea1f7fc94aea923 (diff) | |
| parent | f451e76f896922137f8316cb071ae2cab78091ad (diff) | |
| download | linux-5262f25f0983ff6f2c21e3dadcfd0c809e5aa286.tar.bz2 | |
Merge tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
"Misc fixes"
* tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction
HSI: nokia-modem: Reduce missing driver message to debug level
HSI: cmt_speech: fix timestamp interface
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hsi/clients/cmt_speech.c | 9 | ||||
| -rw-r--r-- | drivers/hsi/clients/nokia-modem.c | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c index 4983529a9c6c..d04643f9548b 100644 --- a/drivers/hsi/clients/cmt_speech.c +++ b/drivers/hsi/clients/cmt_speech.c @@ -451,9 +451,14 @@ static void cs_hsi_read_on_control_complete(struct hsi_msg *msg) dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd); cs_release_cmd(msg); if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) { - struct timespec *tstamp = + struct timespec tspec; + struct cs_timestamp *tstamp = &hi->mmap_cfg->tstamp_rx_ctrl; - do_posix_clock_monotonic_gettime(tstamp); + + ktime_get_ts(&tspec); + + tstamp->tv_sec = (__u32) tspec.tv_sec; + tstamp->tv_nsec = (__u32) tspec.tv_nsec; } spin_unlock(&hi->lock); diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c index bbb19231fa82..7f82c911ad74 100644 --- a/drivers/hsi/clients/nokia-modem.c +++ b/drivers/hsi/clients/nokia-modem.c @@ -112,7 +112,8 @@ static int nokia_modem_gpio_probe(struct device *dev) modem->gpio_amount = gpio_count; for (i = 0; i < gpio_count; i++) { - modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i); + modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i, + GPIOD_OUT_LOW); if (IS_ERR(modem->gpios[i].gpio)) { dev_err(dev, "Could not get gpio %d\n", i); return PTR_ERR(modem->gpios[i].gpio); @@ -125,10 +126,6 @@ static int nokia_modem_gpio_probe(struct device *dev) return err; } - err = gpiod_direction_output(modem->gpios[i].gpio, 0); - if (err) - return err; - err = gpiod_export(modem->gpios[i].gpio, 0); if (err) return err; @@ -208,7 +205,7 @@ static int nokia_modem_probe(struct device *dev) err = device_attach(&modem->ssi_protocol->device); if (err == 0) { - dev_err(dev, "Missing ssi-protocol driver\n"); + dev_dbg(dev, "Missing ssi-protocol driver\n"); err = -EPROBE_DEFER; goto error3; } else if (err < 0) { @@ -231,7 +228,7 @@ static int nokia_modem_probe(struct device *dev) err = device_attach(&modem->cmt_speech->device); if (err == 0) { - dev_err(dev, "Missing cmt-speech driver\n"); + dev_dbg(dev, "Missing cmt-speech driver\n"); err = -EPROBE_DEFER; goto error4; } else if (err < 0) { |