PCI/ACPI: Name _OSC #defines more consistently

Make PCI Host Bridge _OSC #defines more consistent.  No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/pci/hotplug/acpi_pcihp.c
Simple merge

diff --cc drivers/pci/hotplug/shpchp.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge