Replace comma between expressions with semicolons.

Using a ',' in place of a ';' can have unintended side effects.
Although that is not the case here, it is seems best to use ';'
unless ',' is intended.

Found by inspection.
No functional change intended.
Compile tested only.

Fixes: e7d5f2ea0923 ("perf/x86/intel/uncore: Add Nova Lake support")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
Changelog:

v1 -> v2:

- Add Fixes tag.
---
 arch/x86/events/intel/uncore_snb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index e8e44741200e..3dbc6bacbd9d 100644
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -2005,11 +2005,11 @@ static struct intel_uncore_type *nvl_msr_uncores[] = {
 void nvl_uncore_cpu_init(void)
 {
 	mtl_uncore_cbox.num_boxes = 12;
-	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0,
-	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0,
+	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0;
+	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0;
 
-	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0,
-	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0,
+	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0;
+	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0;
 
 	mtl_uncore_cncu.box_ctl = NVL_UNC_CNCU_BOX_CTL;
 	mtl_uncore_cncu.fixed_ctr = NVL_UNC_CNCU_FIXED_CTR;
-- 
2.25.1

On 1/14/2026 10:36 AM, Chen Ni wrote:
> Replace comma between expressions with semicolons.
>
> Using a ',' in place of a ';' can have unintended side effects.
> Although that is not the case here, it is seems best to use ';'
> unless ',' is intended.
>
> Found by inspection.
> No functional change intended.
> Compile tested only.
>
> Fixes: e7d5f2ea0923 ("perf/x86/intel/uncore: Add Nova Lake support")
> Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
> ---
> Changelog:
>
> v1 -> v2:
>
> - Add Fixes tag.
> ---
>  arch/x86/events/intel/uncore_snb.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
> index e8e44741200e..3dbc6bacbd9d 100644
> --- a/arch/x86/events/intel/uncore_snb.c
> +++ b/arch/x86/events/intel/uncore_snb.c
> @@ -2005,11 +2005,11 @@ static struct intel_uncore_type *nvl_msr_uncores[] = {
>  void nvl_uncore_cpu_init(void)
>  {
>  	mtl_uncore_cbox.num_boxes = 12;
> -	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0,
> -	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0,
> +	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0;
> +	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0;
>  
> -	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0,
> -	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0,
> +	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0;
> +	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0;
>  
>  	mtl_uncore_cncu.box_ctl = NVL_UNC_CNCU_BOX_CTL;
>  	mtl_uncore_cncu.fixed_ctr = NVL_UNC_CNCU_FIXED_CTR;

Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     10d6d2416db2137a5a0ef9162662e5b7fee56dd4
Gitweb:        https://git.kernel.org/tip/10d6d2416db2137a5a0ef9162662e5b7fee56dd4
Author:        Chen Ni <nichen@iscas.ac.cn>
AuthorDate:    Wed, 14 Jan 2026 10:36:52 +08:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 15 Jan 2026 10:04:28 +01:00

perf/x86/intel/uncore: Convert comma to semicolon

Replace comma between expressions with semicolons.

Using a ',' in place of a ';' can have unintended side effects.
Although that is not the case here, it is seems best to use ';'
unless ',' is intended.

Found by inspection.
No functional change intended.
Compile tested only.

Fixes: e7d5f2ea0923 ("perf/x86/intel/uncore: Add Nova Lake support")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://patch.msgid.link/20260114023652.3926117-1-nichen@iscas.ac.cn
---
 arch/x86/events/intel/uncore_snb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index e8e4474..3dbc6ba 100644
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -2005,11 +2005,11 @@ static struct intel_uncore_type *nvl_msr_uncores[] = {
 void nvl_uncore_cpu_init(void)
 {
 	mtl_uncore_cbox.num_boxes = 12;
-	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0,
-	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0,
+	mtl_uncore_cbox.perf_ctr = NVL_UNC_CBOX_PER_CTR0;
+	mtl_uncore_cbox.event_ctl = NVL_UNC_CBOX_PERFEVTSEL0;
 
-	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0,
-	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0,
+	ptl_uncore_santa.perf_ctr = NVL_UNC_SANTA_CTR0;
+	ptl_uncore_santa.event_ctl = NVL_UNC_SANTA_CTRL0;
 
 	mtl_uncore_cncu.box_ctl = NVL_UNC_CNCU_BOX_CTL;
 	mtl_uncore_cncu.fixed_ctr = NVL_UNC_CNCU_FIXED_CTR;