diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-08-22 00:28:09 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-06 17:03:26 +0200 |
commit | 80464f441b439ae6509c2ff45f0a3a18dd0a9314 (patch) | |
tree | e54e456b09186c4e90230b9ee78fdd69fecbd685 | |
parent | 712a0a7a78bbffd1454c50ece751aa1f9b0d6137 (diff) |
patch: Allow usage of pci_error_handlers->reset_notify
The member reset_notify in the struct pci_error_handlers was divided
into reset_prepare and reset_done in upstream commit 775755ed3c65fb
("PCI: Split ->reset_notify() method into ->reset_prepare() and
->reset_done()"). Make new code also work with old kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | patches/0082-pci_error_handlers.cocci | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/0082-pci_error_handlers.cocci b/patches/0082-pci_error_handlers.cocci new file mode 100644 index 00000000..9b5573d4 --- /dev/null +++ b/patches/0082-pci_error_handlers.cocci @@ -0,0 +1,32 @@ +@r@ +identifier OPS; +identifier pcie_reset_prepare_fn; +identifier pcie_reset_done_fn; +fresh identifier pcie_reset_notify_fn = pcie_reset_prepare_fn ## "_notify"; +position p; +@@ +struct pci_error_handlers OPS@p = { ++#if LINUX_VERSION_IS_GEQ(4,13,0) + .reset_prepare = pcie_reset_prepare_fn, + .reset_done = pcie_reset_done_fn, ++#else ++ .reset_notify = pcie_reset_notify_fn, ++#endif +}; + + +@@ +identifier r.pcie_reset_prepare_fn; +identifier r.pcie_reset_done_fn; +identifier r.pcie_reset_notify_fn; +@@ +void pcie_reset_done_fn(...) {...} ++#if LINUX_VERSION_IS_LESS(4,13,0) ++static void pcie_reset_notify_fn(struct pci_dev *dev, bool prepare) ++{ ++ if (prepare) ++ pcie_reset_prepare_fn(dev); ++ else ++ pcie_reset_done_fn(dev); ++} ++#endif |