Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e8af37a authored by Stefan Assmann's avatar Stefan Assmann Committed by Jesse Barnes
Browse files

PCI: change PCI nomenclature in drivers/pci/ (non-comment changes) 

Changing occurrences of variants of PCI-X and PCIe to the PCI-SIG
terms listed in the "Trademark and Logo Usage Guidelines".
http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf



Patch is limited to drivers/pci/ and changes concern non-comment parts or
anything that might be visible to the user.

Signed-off-by: default avatarStefan Assmann <sassmann@redhat.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 45e829ea

drivers/pci/pcie/aer/Kconfig.debug

+2 −2
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ 
#



config PCIEAER_INJECT

	tristate "PCIE AER error injector support"

	tristate "PCIe AER error injector support"

	depends on PCIEAER

	default n

	help

	  This enables PCI Express Root Port Advanced Error Reporting

	  (AER) software error injector.



	  Debuging PCIE AER code is quite difficult because it is hard

	  Debugging PCIe AER code is quite difficult because it is hard

	  to trigger various real hardware errors. Software based

	  error injection can fake almost all kinds of errors with the

	  help of a user space helper tool aer-inject, which can be

drivers/pci/pcie/aer/aer_inject.c

+1 −1
Original line number Diff line number Diff line
@@ -484,5 +484,5 @@ static void __exit aer_inject_exit(void) 
module_init(aer_inject_init);

module_exit(aer_inject_exit);



MODULE_DESCRIPTION("PCIE AER software error injector");

MODULE_DESCRIPTION("PCIe AER software error injector");

MODULE_LICENSE("GPL");

drivers/pci/pcie/aer/aerdrv_errprint.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) 


	if (info->status == 0) {

		AER_PR(info, dev,

			"PCIE Bus Error: severity=%s, type=Unaccessible, "

			"PCIe Bus Error: severity=%s, type=Unaccessible, "

			"id=%04x(Unregistered Agent ID)\n",

			aer_error_severity_string[info->severity], id);

	} else {
@@ -194,7 +194,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) 
		agent = AER_GET_AGENT(info->severity, info->status);



		AER_PR(info, dev,

			"PCIE Bus Error: severity=%s, type=%s, id=%04x(%s)\n",

			"PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",

			aer_error_severity_string[info->severity],

			aer_error_layer[layer], id, aer_agent_string[agent]);

drivers/pci/pcie/portdrv_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 */

#define DRIVER_VERSION "v1.0"

#define DRIVER_AUTHOR "tom.l.nguyen@intel.com"

#define DRIVER_DESC "PCIE Port Bus Driver"

#define DRIVER_DESC "PCIe Port Bus Driver"

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");