From 266b26b3eda733dcc2c0a7cc6061b024a0dede70 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sat, 22 Mar 2014 14:59:58 +0100 Subject: lib/intel_chipset: intel_ prefix for pch global Just a bit better namespacing. Signed-off-by: Daniel Vetter --- tools/intel_infoframes.c | 4 ++-- tools/intel_reg_dumper.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c index c60a87e6..81e03433 100644 --- a/tools/intel_infoframes.c +++ b/tools/intel_infoframes.c @@ -367,7 +367,7 @@ static void dump_port_info(int hdmi_port_index) if (gen == 4) transcoder = (val & HDMI_PORT_TRANSCODER_GEN4) >> 30; - else if (pch >= PCH_CPT) + else if (intel_pch >= PCH_CPT) transcoder = (val & HDMI_PORT_TRANSCODER_CPT) >> 29; else transcoder = (val & HDMI_PORT_TRANSCODER_IBX) >> 30; @@ -1187,7 +1187,7 @@ int main(int argc, char *argv[]) transcoder = TRANSC_A; else if (!strcmp(optarg, "B")) transcoder = TRANSC_B; - else if (pch >= PCH_CPT && !strcmp(optarg, "C")) { + else if (intel_pch >= PCH_CPT && !strcmp(optarg, "C")) { transcoder = TRANSC_C; } else { printf("Invalid transcoder.\n"); diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c index 805b665c..65fe41eb 100644 --- a/tools/intel_reg_dumper.c +++ b/tools/intel_reg_dumper.c @@ -2931,18 +2931,18 @@ int main(int argc, char** argv) intel_map_file(file); if (devid) { if (IS_GEN5(devid)) - pch = PCH_IBX; + intel_pch = PCH_IBX; else if (IS_GEN6(devid) || IS_IVYBRIDGE(devid)) - pch = PCH_CPT; + intel_pch = PCH_CPT; else if (IS_HASWELL(devid)) - pch = PCH_LPT; + intel_pch = PCH_LPT; else - pch = PCH_NONE; + intel_pch = PCH_NONE; } else { printf("Dumping from file without -d argument. " "Assuming Ironlake machine.\n"); devid = 0x0042; - pch = PCH_IBX; + intel_pch = PCH_IBX; } } else { pci_dev = intel_get_pci_device(); -- cgit v1.2.3