diff options
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv.c')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index e390707661dd..32ade5af927e 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
| @@ -38,30 +38,13 @@ MODULE_AUTHOR(DRIVER_AUTHOR); | |||
| 38 | MODULE_DESCRIPTION(DRIVER_DESC); | 38 | MODULE_DESCRIPTION(DRIVER_DESC); |
| 39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
| 40 | 40 | ||
| 41 | static int __devinit aer_probe (struct pcie_device *dev, | 41 | static int __devinit aer_probe (struct pcie_device *dev); |
| 42 | const struct pcie_port_service_id *id ); | ||
| 43 | static void aer_remove(struct pcie_device *dev); | 42 | static void aer_remove(struct pcie_device *dev); |
| 44 | static int aer_suspend(struct pcie_device *dev, pm_message_t state) | ||
| 45 | {return 0;} | ||
| 46 | static int aer_resume(struct pcie_device *dev) {return 0;} | ||
| 47 | static pci_ers_result_t aer_error_detected(struct pci_dev *dev, | 43 | static pci_ers_result_t aer_error_detected(struct pci_dev *dev, |
| 48 | enum pci_channel_state error); | 44 | enum pci_channel_state error); |
| 49 | static void aer_error_resume(struct pci_dev *dev); | 45 | static void aer_error_resume(struct pci_dev *dev); |
| 50 | static pci_ers_result_t aer_root_reset(struct pci_dev *dev); | 46 | static pci_ers_result_t aer_root_reset(struct pci_dev *dev); |
| 51 | 47 | ||
| 52 | /* | ||
| 53 | * PCI Express bus's AER Root service driver data structure | ||
| 54 | */ | ||
| 55 | static struct pcie_port_service_id aer_id[] = { | ||
| 56 | { | ||
| 57 | .vendor = PCI_ANY_ID, | ||
| 58 | .device = PCI_ANY_ID, | ||
| 59 | .port_type = PCIE_RC_PORT, | ||
| 60 | .service_type = PCIE_PORT_SERVICE_AER, | ||
| 61 | }, | ||
| 62 | { /* end: all zeroes */ } | ||
| 63 | }; | ||
| 64 | |||
| 65 | static struct pci_error_handlers aer_error_handlers = { | 48 | static struct pci_error_handlers aer_error_handlers = { |
| 66 | .error_detected = aer_error_detected, | 49 | .error_detected = aer_error_detected, |
| 67 | .resume = aer_error_resume, | 50 | .resume = aer_error_resume, |
| @@ -69,14 +52,12 @@ static struct pci_error_handlers aer_error_handlers = { | |||
| 69 | 52 | ||
| 70 | static struct pcie_port_service_driver aerdriver = { | 53 | static struct pcie_port_service_driver aerdriver = { |
| 71 | .name = "aer", | 54 | .name = "aer", |
| 72 | .id_table = &aer_id[0], | 55 | .port_type = PCIE_ANY_PORT, |
| 56 | .service = PCIE_PORT_SERVICE_AER, | ||
| 73 | 57 | ||
| 74 | .probe = aer_probe, | 58 | .probe = aer_probe, |
| 75 | .remove = aer_remove, | 59 | .remove = aer_remove, |
| 76 | 60 | ||
| 77 | .suspend = aer_suspend, | ||
| 78 | .resume = aer_resume, | ||
| 79 | |||
| 80 | .err_handler = &aer_error_handlers, | 61 | .err_handler = &aer_error_handlers, |
| 81 | 62 | ||
| 82 | .reset_link = aer_root_reset, | 63 | .reset_link = aer_root_reset, |
| @@ -207,8 +188,7 @@ static void aer_remove(struct pcie_device *dev) | |||
| 207 | * | 188 | * |
| 208 | * Invoked when PCI Express bus loads AER service driver. | 189 | * Invoked when PCI Express bus loads AER service driver. |
| 209 | **/ | 190 | **/ |
| 210 | static int __devinit aer_probe (struct pcie_device *dev, | 191 | static int __devinit aer_probe (struct pcie_device *dev) |
| 211 | const struct pcie_port_service_id *id ) | ||
| 212 | { | 192 | { |
| 213 | int status; | 193 | int status; |
| 214 | struct aer_rpc *rpc; | 194 | struct aer_rpc *rpc; |