Commit 3e2a87a0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aer' 

- Remove pci_disable_pcie_error_reporting() (unused) and unexport
  pci_enable_pcie_error_reporting().  This all done by the PCI core now
  (Bjorn Helgaas)

* pci/aer:
  PCI/AER: Unexport pci_enable_pcie_error_reporting()
  PCI/AER: Drop unused pci_disable_pcie_error_reporting()
parents 06c2afb8 7ec4b34b

drivers/pci/pcie/aer.c

+1 −14
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ int pcie_aer_is_native(struct pci_dev *dev) 
	return pcie_ports_native || host->native_aer;

	return pcie_ports_native || host->native_aer;

}

}





int pci_enable_pcie_error_reporting(struct pci_dev *dev)

static int pci_enable_pcie_error_reporting(struct pci_dev *dev)

{

{

	int rc;

	int rc;
@@ -240,19 +240,6 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev) 
	rc = pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS);

	rc = pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS);

	return pcibios_err_to_errno(rc);

	return pcibios_err_to_errno(rc);

}

}

EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);



int pci_disable_pcie_error_reporting(struct pci_dev *dev)

{

	int rc;



	if (!pcie_aer_is_native(dev))

		return -EIO;



	rc = pcie_capability_clear_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS);

	return pcibios_err_to_errno(rc);

}

EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);





int pci_aer_clear_nonfatal_status(struct pci_dev *dev)

int pci_aer_clear_nonfatal_status(struct pci_dev *dev)

{

{

include/linux/aer.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -41,19 +41,8 @@ struct aer_capability_regs { 
};

};





#if defined(CONFIG_PCIEAER)

#if defined(CONFIG_PCIEAER)

/* PCIe port driver needs this function to enable AER */

int pci_enable_pcie_error_reporting(struct pci_dev *dev);

int pci_disable_pcie_error_reporting(struct pci_dev *dev);

int pci_aer_clear_nonfatal_status(struct pci_dev *dev);

int pci_aer_clear_nonfatal_status(struct pci_dev *dev);

#else

#else

static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)

{

	return -EINVAL;

}

static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)

{

	return -EINVAL;

}

static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)

static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)

{

{

	return -EINVAL;

	return -EINVAL;