Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91675
b: refs/heads/master
c: 21c6847
h: refs/heads/master
i:
  91673: faa2d12
  91671: a3dbc6d
v: v3
  • Loading branch information
Adrian Bunk authored and Greg Kroah-Hartman committed Apr 21, 2008
1 parent 9d71ded commit 4c3e6ac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c44bac8645e0ce0249c53cc154f56b5543af232
refs/heads/master: 21c6847406784fde73ad5ea47c2c3434714d58d1
3 changes: 2 additions & 1 deletion trunk/drivers/pci/pcie/aer/aerdrv_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
return 0;
}

#if 0
int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
{
int pos;
Expand All @@ -131,6 +132,7 @@ int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)

return 0;
}
#endif /* 0 */

static int find_device_iter(struct device *device, void *data)
{
Expand Down Expand Up @@ -757,5 +759,4 @@ EXPORT_SYMBOL_GPL(pci_find_aer_capability);
EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);
EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);
EXPORT_SYMBOL_GPL(pci_cleanup_aer_correct_error_status);

5 changes: 0 additions & 5 deletions trunk/include/linux/aer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
extern int pci_find_aer_capability(struct pci_dev *dev);
extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);
#else
static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
{
Expand All @@ -31,10 +30,6 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
{
return -EINVAL;
}
static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
{
return -EINVAL;
}
#endif

#endif //_AER_H_
Expand Down

0 comments on commit 4c3e6ac

Please sign in to comment.