aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOza Pawandeep <poza@codeaurora.org>2018-07-19 18:58:10 -0400
committerBjorn Helgaas <bhelgaas@google.com>2018-07-20 16:27:13 -0400
commit89e1f5cb1ecc1cd509a196f4e79d12a1e39410b6 (patch)
tree020a6a67939f37ceee75e33ae44c4b3b0756fb7b
parent10d790d99d3b42ec07d54178b291708f14af886d (diff)
PCI/portdrv: Remove pcie_portdrv_err_handler.slot_reset
The pci_error_handlers.slot_reset() callback is only used for non-bridge devices (see broadcast_error_message()). Since portdrv only binds to bridges, we don't need pcie_portdrv_slot_reset(), so remove it. Signed-off-by: Oza Pawandeep <poza@codeaurora.org> [bhelgaas: changelog, remove pcie_portdrv_slot_reset() completely] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/pcie/portdrv_pci.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 973f1b80a038..b78840f54a9b 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -42,17 +42,6 @@ __setup("pcie_ports=", pcie_port_setup);
42 42
43/* global data */ 43/* global data */
44 44
45static int pcie_portdrv_restore_config(struct pci_dev *dev)
46{
47 int retval;
48
49 retval = pci_enable_device(dev);
50 if (retval)
51 return retval;
52 pci_set_master(dev);
53 return 0;
54}
55
56#ifdef CONFIG_PM 45#ifdef CONFIG_PM
57static int pcie_port_runtime_suspend(struct device *dev) 46static int pcie_port_runtime_suspend(struct device *dev)
58{ 47{
@@ -160,19 +149,6 @@ static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
160 return PCI_ERS_RESULT_RECOVERED; 149 return PCI_ERS_RESULT_RECOVERED;
161} 150}
162 151
163static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
164{
165 /* If fatal, restore cfg space for possible link reset at upstream */
166 if (dev->error_state == pci_channel_io_frozen) {
167 dev->state_saved = true;
168 pci_restore_state(dev);
169 pcie_portdrv_restore_config(dev);
170 pci_enable_pcie_error_reporting(dev);
171 }
172
173 return PCI_ERS_RESULT_RECOVERED;
174}
175
176static int resume_iter(struct device *device, void *data) 152static int resume_iter(struct device *device, void *data)
177{ 153{
178 struct pcie_device *pcie_device; 154 struct pcie_device *pcie_device;
@@ -208,7 +184,6 @@ static const struct pci_device_id port_pci_ids[] = { {
208static const struct pci_error_handlers pcie_portdrv_err_handler = { 184static const struct pci_error_handlers pcie_portdrv_err_handler = {
209 .error_detected = pcie_portdrv_error_detected, 185 .error_detected = pcie_portdrv_error_detected,
210 .mmio_enabled = pcie_portdrv_mmio_enabled, 186 .mmio_enabled = pcie_portdrv_mmio_enabled,
211 .slot_reset = pcie_portdrv_slot_reset,
212 .resume = pcie_portdrv_err_resume, 187 .resume = pcie_portdrv_err_resume,
213}; 188};
214 189