diff mbox

klog.json: remove unnecessary comma and trailing spaces

Message ID 1494476513-27080-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung May 11, 2017, 4:21 a.m. UTC
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 data/klog.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Colin Ian King May 11, 2017, 6:45 a.m. UTC | #1
On 11/05/17 05:21, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  data/klog.json | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/data/klog.json b/data/klog.json
> index d329985..7104f2b 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -1,6 +1,6 @@
>  {
>   "firmware_error_warning_patterns":
> - [ 
> + [
>    {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_MEDIUM",
> @@ -2975,21 +2975,21 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>     "log_level": "LOG_LEVEL_LOW",
>     "pattern": "lpc_ich: Resource conflict(s) found affecting iTCO_wdt",
>     "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the Intel TCO (Total Cost of Ownership) timer (iTCO_wdt, this is a watchdog timer that will reboot the machine after its second expiration). According to Intel Controller Hub (ICH) specifications, the TCO watchdog has a 32 bytes I/O space resource. ACPI OperationRegions in the DSDT frequently reserve this TCO I/O space because they require access to bit 9 (DMISCI_STS) of the TCO1_STS register of the TCO, however, this bit is never used by the lpc_ich driver, so there is no risk of conflict. In the vast majority of cases this warning can be ignored as no harm will occur.",
> -   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
> +   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
>    },
>    {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_LOW",
>     "pattern": "lpc_ich: Resource conflict(s) found affecting gpio_ich",
>     "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the General Purpose I/O (GPIO) region. Sometimes this GPIO region is used by the firmware for rfkill or LED controls or very rarely for the Embedded Controller System Control Interrupt. This may require deeper inspection to check if the conflict will lead to any real issues.  However, in the vast majority of cases this warning can be ignored as no harm will occur.",
> -   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
> +   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
>    },
>    {
>     "compare_mode": "regex",
>     "log_level": "LOG_LEVEL_LOW",
>     "pattern": "0x.*-0x.* SystemIO conflicts with",
>     "advice": "A resource conflict between an ACPI OperationRegion and a native driver has been detected. By default the kernel will use a strict policy and will not allow this region to conflict and -EBUSY will be returned to the caller that was trying to allocate the already claimed region.  If an ACPI driver is available for this device then this should be used instead of a native driver, so disabling the native driver may help.  (Note that the lpc_ich driver can trigger these warnings, in which case they can generally be ignored). One can specify kernel boot parameter acpi_enforce_resources=lax to disable these checks but it may lead to random problems and system instability.  Alternatively, one can specify acpi_enforce_resources=no and ACPI Operation Region resources will not be registered.",
> -   "label": "KlogAcpiSystemIOConflict",
> +   "label": "KlogAcpiSystemIOConflict"
>    },
>    {
>     "compare_mode": "regex",
> @@ -5720,7 +5720,7 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>     "pattern": "_BCQ is used instead of _BQC",
>     "advice": "ACPI Method _BCQ was defined (typo) instead of _BQC - this should be fixed.however the kernel has detected this and is working around this typo.",
>     "label": "KlogAcpiBcqInsteadOfBqc"
> -  }, 
> +  },
>    {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_CRITICAL",
> @@ -5992,8 +5992,8 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>     "pattern": "Return object type is incorrect",
>     "advice": "Return object type is not the correct type, this is an AML error in the DSDT or SSDT. See also acpi_ut_evaluate_object().",
>     "label": "KlogAcpiReturnObjectTypeIncorrect"
> -  } 
> - ], 
> +  }
> + ],
>   "pm_error_warning_patterns":
>   [
>    {
> @@ -6178,5 +6178,5 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>     "advice": "Softlock errors that occur when coming out of S3 may be tripped by TSC warping.  It may be worth trying the notsc kernel parameter and repeating S3 tests to see if this solves the problem.",
>     "label": "PmProcessSoftLockup"
>    }
> - ] 
> + ]
>  }
> 

Thanks for cleaning those up Alex.

Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu May 23, 2017, 6:50 a.m. UTC | #2
On 05/11/2017 12:21 PM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>   data/klog.json | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index d329985..7104f2b 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -1,6 +1,6 @@
>   {
>    "firmware_error_warning_patterns":
> - [
> + [
>     {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_MEDIUM",
> @@ -2975,21 +2975,21 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>      "log_level": "LOG_LEVEL_LOW",
>      "pattern": "lpc_ich: Resource conflict(s) found affecting iTCO_wdt",
>      "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the Intel TCO (Total Cost of Ownership) timer (iTCO_wdt, this is a watchdog timer that will reboot the machine after its second expiration). According to Intel Controller Hub (ICH) specifications, the TCO watchdog has a 32 bytes I/O space resource. ACPI OperationRegions in the DSDT frequently reserve this TCO I/O space because they require access to bit 9 (DMISCI_STS) of the TCO1_STS register of the TCO, however, this bit is never used by the lpc_ich driver, so there is no risk of conflict. In the vast majority of cases this warning can be ignored as no harm will occur.",
> -   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
> +   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
>     },
>     {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_LOW",
>      "pattern": "lpc_ich: Resource conflict(s) found affecting gpio_ich",
>      "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the General Purpose I/O (GPIO) region. Sometimes this GPIO region is used by the firmware for rfkill or LED controls or very rarely for the Embedded Controller System Control Interrupt. This may require deeper inspection to check if the conflict will lead to any real issues.  However, in the vast majority of cases this warning can be ignored as no harm will occur.",
> -   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
> +   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
>     },
>     {
>      "compare_mode": "regex",
>      "log_level": "LOG_LEVEL_LOW",
>      "pattern": "0x.*-0x.* SystemIO conflicts with",
>      "advice": "A resource conflict between an ACPI OperationRegion and a native driver has been detected. By default the kernel will use a strict policy and will not allow this region to conflict and -EBUSY will be returned to the caller that was trying to allocate the already claimed region.  If an ACPI driver is available for this device then this should be used instead of a native driver, so disabling the native driver may help.  (Note that the lpc_ich driver can trigger these warnings, in which case they can generally be ignored). One can specify kernel boot parameter acpi_enforce_resources=lax to disable these checks but it may lead to random problems and system instability.  Alternatively, one can specify acpi_enforce_resources=no and ACPI Operation Region resources will not be registered.",
> -   "label": "KlogAcpiSystemIOConflict",
> +   "label": "KlogAcpiSystemIOConflict"
>     },
>     {
>      "compare_mode": "regex",
> @@ -5720,7 +5720,7 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>      "pattern": "_BCQ is used instead of _BQC",
>      "advice": "ACPI Method _BCQ was defined (typo) instead of _BQC - this should be fixed.however the kernel has detected this and is working around this typo.",
>      "label": "KlogAcpiBcqInsteadOfBqc"
> -  },
> +  },
>     {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_CRITICAL",
> @@ -5992,8 +5992,8 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>      "pattern": "Return object type is incorrect",
>      "advice": "Return object type is not the correct type, this is an AML error in the DSDT or SSDT. See also acpi_ut_evaluate_object().",
>      "label": "KlogAcpiReturnObjectTypeIncorrect"
> -  }
> - ],
> +  }
> + ],
>    "pm_error_warning_patterns":
>    [
>     {
> @@ -6178,5 +6178,5 @@ atform Communications Channel Table (PCCT) and find the PCC subspace communicati
>      "advice": "Softlock errors that occur when coming out of S3 may be tripped by TSC warping.  It may be worth trying the notsc kernel parameter and repeating S3 tests to see if this solves the problem.",
>      "label": "PmProcessSoftLockup"
>     }
> - ]
> + ]
>   }

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/data/klog.json b/data/klog.json
index d329985..7104f2b 100644
--- a/data/klog.json
+++ b/data/klog.json
@@ -1,6 +1,6 @@ 
 {
  "firmware_error_warning_patterns":
- [ 
+ [
   {
    "compare_mode": "string",
    "log_level": "LOG_LEVEL_MEDIUM",
@@ -2975,21 +2975,21 @@  atform Communications Channel Table (PCCT) and find the PCC subspace communicati
    "log_level": "LOG_LEVEL_LOW",
    "pattern": "lpc_ich: Resource conflict(s) found affecting iTCO_wdt",
    "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the Intel TCO (Total Cost of Ownership) timer (iTCO_wdt, this is a watchdog timer that will reboot the machine after its second expiration). According to Intel Controller Hub (ICH) specifications, the TCO watchdog has a 32 bytes I/O space resource. ACPI OperationRegions in the DSDT frequently reserve this TCO I/O space because they require access to bit 9 (DMISCI_STS) of the TCO1_STS register of the TCO, however, this bit is never used by the lpc_ich driver, so there is no risk of conflict. In the vast majority of cases this warning can be ignored as no harm will occur.",
-   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
+   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
   },
   {
    "compare_mode": "string",
    "log_level": "LOG_LEVEL_LOW",
    "pattern": "lpc_ich: Resource conflict(s) found affecting gpio_ich",
    "advice": "A resource conflict has occurred between ACPI OperationRegions and the same I/O region used by the lpc_ich driver for the General Purpose I/O (GPIO) region. Sometimes this GPIO region is used by the firmware for rfkill or LED controls or very rarely for the Embedded Controller System Control Interrupt. This may require deeper inspection to check if the conflict will lead to any real issues.  However, in the vast majority of cases this warning can be ignored as no harm will occur.",
-   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer",
+   "label": "KlogAcpiSystemIOConflictLpcIchWatchDogTimer"
   },
   {
    "compare_mode": "regex",
    "log_level": "LOG_LEVEL_LOW",
    "pattern": "0x.*-0x.* SystemIO conflicts with",
    "advice": "A resource conflict between an ACPI OperationRegion and a native driver has been detected. By default the kernel will use a strict policy and will not allow this region to conflict and -EBUSY will be returned to the caller that was trying to allocate the already claimed region.  If an ACPI driver is available for this device then this should be used instead of a native driver, so disabling the native driver may help.  (Note that the lpc_ich driver can trigger these warnings, in which case they can generally be ignored). One can specify kernel boot parameter acpi_enforce_resources=lax to disable these checks but it may lead to random problems and system instability.  Alternatively, one can specify acpi_enforce_resources=no and ACPI Operation Region resources will not be registered.",
-   "label": "KlogAcpiSystemIOConflict",
+   "label": "KlogAcpiSystemIOConflict"
   },
   {
    "compare_mode": "regex",
@@ -5720,7 +5720,7 @@  atform Communications Channel Table (PCCT) and find the PCC subspace communicati
    "pattern": "_BCQ is used instead of _BQC",
    "advice": "ACPI Method _BCQ was defined (typo) instead of _BQC - this should be fixed.however the kernel has detected this and is working around this typo.",
    "label": "KlogAcpiBcqInsteadOfBqc"
-  }, 
+  },
   {
    "compare_mode": "string",
    "log_level": "LOG_LEVEL_CRITICAL",
@@ -5992,8 +5992,8 @@  atform Communications Channel Table (PCCT) and find the PCC subspace communicati
    "pattern": "Return object type is incorrect",
    "advice": "Return object type is not the correct type, this is an AML error in the DSDT or SSDT. See also acpi_ut_evaluate_object().",
    "label": "KlogAcpiReturnObjectTypeIncorrect"
-  } 
- ], 
+  }
+ ],
  "pm_error_warning_patterns":
  [
   {
@@ -6178,5 +6178,5 @@  atform Communications Channel Table (PCCT) and find the PCC subspace communicati
    "advice": "Softlock errors that occur when coming out of S3 may be tripped by TSC warping.  It may be worth trying the notsc kernel parameter and repeating S3 tests to see if this solves the problem.",
    "label": "PmProcessSoftLockup"
   }
- ] 
+ ]
 }