diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 18:22:21 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 18:22:21 +0300 |
| commit | 5e9b41ff0968e94bdae030296cce94f418b74ed3 (patch) | |
| tree | d4cc64eadaa3f5cc8f09811fe92027682ed02028 /drivers/firmware | |
| parent | 3330becb479fd26cfeeea1e06f8999c3b10806cc (diff) | |
| parent | 595f3a9de5815d38198136491fa50a8ee1700b7d (diff) | |
| download | linux-5e9b41ff0968e94bdae030296cce94f418b74ed3.tar.xz | |
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
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/ti_sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 00cfed3c3e1a..23b12d99ddfe 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -439,7 +439,7 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info, /* And we wait for the response. */ timeout = msecs_to_jiffies(info->desc->max_rx_timeout_ms); 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_); ret = -ETIMEDOUT; } |