Merge branch 'pci/error'

- Use pci_channel_state_t instead of enum pci_channel_state (Luc Van Oostenryck) - Simplify __aer_print_error() (Bjorn Helgaas) - Log AER correctable errors as warning, not error (Matt Jolly) - Rename pci_aer_clear_device_status() to pcie_clear_device_status() (Bjorn Helgaas) - Clear PCIe Device Status errors only if OS owns AER (Jonathan Cameron) * pci/error: PCI/ERR: Clear PCIe Device Status errors only if OS owns AER PCI/ERR: Rename pci_aer_clear_device_status() to pcie_clear_device_status() PCI/AER: Log correctable errors as warning, not error PCI/AER: Simplify __aer_print_error() PCI: Use 'pci_channel_state_t' instead of 'enum pci_channel_state'

Bjorn Helgaas committed 6 years ago

Commit b0735e82 parents 3f906da 068c29a20 files · +82 −56Browse files

Showing the changes to include/linux (1 of 20 files). Show all

Unified · Split

include/linux/pci.h+2−2

@@ -179,7 +179,7 @@ static inline const char *pci_power_name(pci_power_t state) · 178 unmodified lines
179	179	*/
180	180	typedef unsigned int __bitwise pci_channel_state_t;
181	181
182		−enum pci_channel_state {
	182	+enum {
183	183	/* I/O channel is in normal state */
184	184	pci_channel_io_normal = (__force pci_channel_state_t) 1,
185	185
@@ -792,7 +792,7 @@ enum pci_ers_result { · 606 unmodified lines
792	792	struct pci_error_handlers {
793	793	/* PCI bus error detected on this device */
794	794	pci_ers_result_t (error_detected)(struct pci_dev dev,
795		− enum pci_channel_state error);
	795	+ pci_channel_state_t error);
796	796
797	797	/* MMIO has been re-enabled, but not DMA */
798	798	pci_ers_result_t (mmio_enabled)(struct pci_dev dev);