summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 11:23:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 11:23:24 -0800
commit01e0d6037de687fd3bb8b45ab1376e8322c1fcc9 (patch)
tree6f79023e4723f9393071b81a9086a055fc1a0190 /include
parent6ac3bb167fed0b3d02b4fd3daa0d819841d5f6f4 (diff)
parentdfb7d24c5ad5c986f2417f52784738b67cfedd4d (diff)
downloadlinux-01e0d6037de687fd3bb8b45ab1376e8322c1fcc9.tar.bz2
Merge tag 'ntb-4.10' of git://github.com/jonmason/ntb
Pull NTB update from Jon Mason: - NTB bug fixes for removing an unnecessary call to ntb_peer_spad_read, and correcting a free_irq inconsistency - add Intel SKX support - change the AMD NTB maintainer, and fix some bugs present there * tag 'ntb-4.10' of git://github.com/jonmason/ntb: ntb_transport: Remove unnecessary call to ntb_peer_spad_read NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy ntb: fix SKX NTB config space size register offsets NTB: correct ntb_peer_spad_read for case when callback is not supplied. MAINTAINERS: Change in maintainer for AMD NTB ntb_transport: Limit memory windows based on available, scratchpads NTB: Register and offset values fix for memory window NTB: add support for hotplug feature ntb: Adding Skylake Xeon NTB support
Diffstat (limited to 'include')
-rw-r--r--include/linux/ntb.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index 50a7dbe88cf3..de87ceac110e 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -968,6 +968,9 @@ static inline int ntb_peer_spad_addr(struct ntb_dev *ntb, int idx,
*/
static inline u32 ntb_peer_spad_read(struct ntb_dev *ntb, int idx)
{
+ if (!ntb->ops->peer_spad_read)
+ return 0;
+
return ntb->ops->peer_spad_read(ntb, idx);
}