Commit 5e9b41ff authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'keystone_soc_drivers_4.15' of...

Merge tag 'keystone_soc_drivers_4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers

Pull "Keystone SOC for 4.15" from Santosh Shilimkar

* tag 'keystone_soc_drivers_4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ti_sci: Use %pS printk format for direct addresses
parents 3330becb 595f3a9d
...@@ -439,7 +439,7 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info, ...@@ -439,7 +439,7 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info,
/* And we wait for the response. */ /* And we wait for the response. */
timeout = msecs_to_jiffies(info->desc->max_rx_timeout_ms); timeout = msecs_to_jiffies(info->desc->max_rx_timeout_ms);
if (!wait_for_completion_timeout(&xfer->done, timeout)) { if (!wait_for_completion_timeout(&xfer->done, timeout)) {
dev_err(dev, "Mbox timedout in resp(caller: %pF)\n", dev_err(dev, "Mbox timedout in resp(caller: %pS)\n",
(void *)_RET_IP_); (void *)_RET_IP_);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment