[PATCH] acpi: acpiinfo: tidy up source
Alex Hung
alex.hung at canonical.com
Wed Mar 7 13:16:32 UTC 2012
On 12-03-02 05:18 PM, Colin King wrote:
> From: Colin Ian King<colin.king at canonical.com>
>
> Signed-off-by: Colin Ian King<colin.king at canonical.com>
> ---
> src/acpi/acpiinfo/acpiinfo.c | 70 +++++++++++++++++++++--------------------
> 1 files changed, 36 insertions(+), 34 deletions(-)
>
> diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c
> index 70b2337..3d0825b 100644
> --- a/src/acpi/acpiinfo/acpiinfo.c
> +++ b/src/acpi/acpiinfo/acpiinfo.c
> @@ -33,78 +33,80 @@
> static void acpiinfo_check(fwts_framework *fw, char *line,
> int repeated, char *prevline, void *private, int *errors)
> {
> - if (strstr(line, "ACPI: Subsystem revision")!=NULL) {
> - char *version = strstr(line,"sion ");
> + if (strstr(line, "ACPI: Subsystem revision") != NULL) {
> + char *version = strstr(line, "sion ");
> if (version) {
> - version+=5;
> + version += 5;
> fwts_log_info(fw, "Linux ACPI interpreter version %s.",
> version);
> }
> }
>
> - if (strstr(line, "ACPI: DSDT")!=NULL) {
> + if (strstr(line, "ACPI: DSDT") != NULL) {
> char *vendor = "Unknown";
> - if (strstr(line,"MSFT"))
> - vendor="Microsoft";
> - if (strstr(line,"INTL"))
> - vendor="Intel";
> - fwts_log_info(fw,"DSDT was compiled by the %s AML compiler.",
> + if (strstr(line, "MSFT"))
> + vendor = "Microsoft";
> + if (strstr(line, "INTL"))
> + vendor = "Intel";
> + fwts_log_info(fw, "DSDT was compiled by the %s AML compiler.",
> vendor);
> }
>
> - if (strstr(line, "Disabling IRQ")!=NULL&& prevline&& strstr(prevline,"acpi_irq")) {
> + if (strstr(line, "Disabling IRQ") != NULL&& prevline&&
> + strstr(prevline, "acpi_irq")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "ACPIIRQStuck",
> "ACPI interrupt got stuck: level triggered?");
> fwts_tag_failed(fw, FWTS_TAG_BIOS_IRQ);
> -
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> - if (prevline&& strstr(prevline, "*** Error: Return object type is incorrect")) {
> + if (prevline&&
> + strstr(prevline, "*** Error: Return object type is incorrect")) {
> fwts_failed(fw, LOG_LEVEL_HIGH, "BadObjectReturn",
> "Return object type is incorrect: %s.", line);
> fwts_tag_failed(fw, FWTS_TAG_ACPI_METHOD_RETURN);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> - if (strstr(line,"ACPI: acpi_ec_space_handler: bit_width is 32, should be")) {
> + if (strstr(line, "ACPI: acpi_ec_space_handler: bit_width is 32, "
> + "should be")) {
> fwts_failed(fw, LOG_LEVEL_LOW, "ECBitWidth",
> "Embedded controller bit_width is incorrect: %s.",
> line);
> fwts_tag_failed(fw, FWTS_TAG_EMBEDDED_CONTROLLER);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> - if (strstr(line,"acpi_ec_space_handler: bit_width should be")) {
> + if (strstr(line, "acpi_ec_space_handler: bit_width should be")) {
> fwts_failed(fw, LOG_LEVEL_LOW, "ECBitWidth2",
> "Embedded controller bit_width is incorrect: %s.",
> line);
> fwts_tag_failed(fw, FWTS_TAG_EMBEDDED_CONTROLLER);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> - if (strstr(line,"Warning: acpi_table_parse(ACPI_SRAT) returned 0!")) {
> + if (strstr(line, "Warning: acpi_table_parse(ACPI_SRAT) returned 0!")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "NoSRAT",
> "SRAT table cannot be found");
> fwts_tag_failed(fw, FWTS_TAG_ACPI);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> - if (strstr(line,"Warning: acpi_table_parse(ACPI_SLIT) returned 0!")) {
> + if (strstr(line, "Warning: acpi_table_parse(ACPI_SLIT) returned 0!")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "NoSLIT",
> "SLIT table cannot be found");
> fwts_tag_failed(fw, FWTS_TAG_ACPI);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "WARNING: No sibling found for CPU")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "CPUHyperthreading",
> "Hyperthreading CPU enumeration fails.");
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (prevline&& strstr(line, ">>> ERROR: Invalid checksum")&&
> - strlen(prevline)>11) {
> + strlen(prevline)> 11) {
> char tmp[4096];
>
> strncpy(tmp, prevline, sizeof(tmp));
> @@ -112,21 +114,21 @@ static void acpiinfo_check(fwts_framework *fw, char *line,
> fwts_failed(fw, LOG_LEVEL_HIGH, "InvalidTableChecksum",
> "ACPI table %s has an invalid checksum.", tmp+6);
> fwts_tag_failed(fw, FWTS_TAG_ACPI_TABLE_CHECKSUM);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "MP-BIOS bug: 8254 timer not connected to IO-APIC")) {
> fwts_failed(fw, LOG_LEVEL_HIGH, "8254NotConnected",
> "8254 timer not connected to IO-APIC: %s.", line);
> fwts_tag_failed(fw, FWTS_TAG_ACPI_APIC);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "ACPI: PCI Interrupt Link")&&
> strstr(line, " disabled and referenced, BIOS bug.")) {
> fwts_failed(fw, LOG_LEVEL_HIGH, "PCIInterruptLink", "%s", line);
> fwts_tag_failed(fw, FWTS_TAG_BIOS_IRQ);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "*** Warning Inconsistent FADT length")&&
> @@ -134,28 +136,28 @@ static void acpiinfo_check(fwts_framework *fw, char *line,
> fwts_failed(fw, LOG_LEVEL_HIGH, "FADTRevsion",
> "FADT table claims to be of higher revision than it is.");
> fwts_tag_failed(fw, FWTS_TAG_ACPI_INVALID_TABLE);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "thermal_get_trip_point: Invalid active threshold")) {
> fwts_failed(fw, LOG_LEVEL_CRITICAL, "_AC0TripPoint",
> "_AC0 thermal trip point is invalid.");
> fwts_tag_failed(fw, FWTS_TAG_ACPI_THERMAL);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "MMCONFIG has no entries")) {
> fwts_failed(fw, LOG_LEVEL_HIGH, "MCFGNoEntries",
> "The MCFG table has no entries!");
> fwts_tag_failed(fw, FWTS_TAG_ACPI_INVALID_TABLE);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "MMCONFIG not in low 4GB of memory")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "MCFGEntriesTooHigh",
> "The MCFG table entries are not in the lower 4Gb of RAM.");
> fwts_tag_failed(fw, FWTS_TAG_BIOS_MMCONFIG);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "pcie_portdrv_probe->Dev")&&
> @@ -163,14 +165,14 @@ static void acpiinfo_check(fwts_framework *fw, char *line,
> fwts_failed(fw, LOG_LEVEL_HIGH, "PCIExpressInvalidIRQ",
> "PCI Express port driver reports an invalid IRQ.");
> fwts_tag_failed(fw, FWTS_TAG_BIOS_IRQ);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> }
>
> if (strstr(line, "OCHI: BIOS handoff failed (BIOS bug")) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "OHCIEmulation",
> "OHCI BIOS emulation handoff failed.");
> fwts_tag_failed(fw, FWTS_TAG_BIOS);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> fwts_advice(fw,
> "Generally this means that the EHCI driver was unable "
> "to take control of the USB controller away from the "
> @@ -180,7 +182,7 @@ static void acpiinfo_check(fwts_framework *fw, char *line,
> fwts_failed(fw, LOG_LEVEL_MEDIUM, "EHCIEmulation",
> "EHCI BIOS emulation handoff failed.");
> fwts_tag_failed(fw, FWTS_TAG_BIOS);
> - fwts_log_info_verbatum(fw,"%s", line);
> + fwts_log_info_verbatum(fw, "%s", line);
> fwts_advice(fw,
> "Generally this means that the EHCI driver was unable "
> "to take control of the USB controller away from the "
Acked-by: Alex Hung <alex.hung at canonical.com>
More information about the fwts-devel
mailing list