From 75337b41eb5147f8b9d3c82d8051f1832def43ab Mon Sep 17 00:00:00 2001 From: Chao Song Date: Thu, 21 Sep 2023 14:45:52 +0800 Subject: [PATCH] topology2: remove duplicated pipeline index attribute definition The pipeline-common.conf helps us to define several common pipeline attributes include pipeline index, there is no need to define pipeline index in each pipeline class definition if pipeline-common.conf is included. Signed-off-by: Chao Song --- .../topology2/include/pipelines/cavs/dai-copier-be.conf | 2 -- .../pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf | 2 -- .../include/pipelines/cavs/dai-copier-gain-mixin-capture.conf | 2 -- .../pipelines/cavs/dai-copier-gain-module-copier-capture.conf | 2 -- tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf | 2 -- .../topology2/include/pipelines/cavs/deepbuffer-playback.conf | 2 -- .../topology/topology2/include/pipelines/cavs/gain-capture.conf | 2 -- .../topology2/include/pipelines/cavs/gain-copier-capture.conf | 2 -- .../topology2/include/pipelines/cavs/gain-module-copier.conf | 2 -- .../topology2/include/pipelines/cavs/gain-playback.conf | 2 -- .../include/pipelines/cavs/google-rtc-aec-capture.conf | 2 -- .../topology2/include/pipelines/cavs/highpass-capture-be.conf | 2 -- .../include/pipelines/cavs/host-copier-gain-mixin-playback.conf | 2 -- .../pipelines/cavs/host-copier-gain-src-mixin-playback.conf | 2 -- .../topology2/include/pipelines/cavs/host-gateway-capture.conf | 2 -- .../topology2/include/pipelines/cavs/host-gateway-playback.conf | 2 -- .../topology2/include/pipelines/cavs/io-gateway-capture.conf | 2 -- tools/topology/topology2/include/pipelines/cavs/io-gateway.conf | 2 -- .../include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf | 2 -- .../include/pipelines/cavs/mixout-dai-copier-playback.conf | 2 -- .../pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf | 2 -- .../include/pipelines/cavs/mixout-gain-dai-copier-playback.conf | 2 -- .../pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf | 2 -- .../cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf | 2 -- .../include/pipelines/cavs/mixout-gain-host-copier-capture.conf | 2 -- .../topology/topology2/include/pipelines/cavs/mixout-mixin.conf | 2 -- .../include/pipelines/cavs/src-gain-mixin-playback.conf | 2 -- tools/topology/topology2/include/pipelines/cavs/wov-detect.conf | 2 -- 28 files changed, 56 deletions(-) diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf index d17e651316b9..c8e8699f1294 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf @@ -22,8 +22,6 @@ Class.Pipeline."dai-copier-be" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf index 131e5969cd4e..4869a6bb3bd7 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf @@ -25,8 +25,6 @@ Class.Pipeline."dai-copier-eqiir-module-copier-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf index a5ce31f7aa30..7f7a85d4724e 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf @@ -24,8 +24,6 @@ Class.Pipeline."dai-copier-gain-mixin-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf index 072a5f9be1be..2e38db9f0719 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf @@ -23,8 +23,6 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf index 70bc4f2c8dba..28d2f8c47d74 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf @@ -24,8 +24,6 @@ Class.Pipeline."dai-kpb-be" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf index fbb19283a9dd..abe5a468ad01 100644 --- a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf @@ -24,8 +24,6 @@ Class.Pipeline."deepbuffer-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf index 57e65070b6db..12dfae7c26fc 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-capture.conf @@ -24,8 +24,6 @@ Class.Pipeline."gain-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf index 86ee039fd90e..6642d28d2858 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf @@ -24,8 +24,6 @@ Class.Pipeline."gain-copier-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf index 416a4c3b59e1..ff9ef84b6d51 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf @@ -23,8 +23,6 @@ Class.Pipeline."gain-module-copier" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf index 81aedde59f7f..e5e5bc41d9a7 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-playback.conf @@ -23,8 +23,6 @@ Class.Pipeline."gain-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf index 6699ff23bbd0..69729fa0c1ed 100644 --- a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf @@ -25,8 +25,6 @@ Class.Pipeline."google-rtc-aec-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf index 6475b9b719c3..7d43f08f1a61 100644 --- a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf @@ -25,8 +25,6 @@ Class.Pipeline."highpass-capture-be" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf index 814e78252eb8..02f47b204a3b 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf @@ -24,8 +24,6 @@ Class.Pipeline."host-copier-gain-mixin-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf index 05ab5ea46c05..b55f2a18c62f 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf @@ -26,8 +26,6 @@ Class.Pipeline."host-copier-gain-src-mixin-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf index deb9df7f9650..392a76c54734 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf @@ -22,8 +22,6 @@ Class.Pipeline."host-gateway-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf index 577513ad77b4..a2d42e5e3d46 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf @@ -22,8 +22,6 @@ Class.Pipeline."host-gateway-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf index af2094d32ecf..a50b8ed0dd3c 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf @@ -23,8 +23,6 @@ Class.Pipeline."io-gateway-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf index fd160d0d4721..106a17ec463b 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf @@ -24,8 +24,6 @@ Class.Pipeline."io-gateway" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf index 65ae5c009a4e..682b3c47ebe3 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf @@ -25,8 +25,6 @@ Class.Pipeline."mixout-aria-gain-mixin-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf index d426a4d0dac8..ba7997a55006 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf @@ -23,8 +23,6 @@ Class.Pipeline."mixout-dai-copier-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf index a66f846f7d04..ab8ab712c929 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf @@ -22,8 +22,6 @@ Class.Pipeline."mixout-gain-alh-dai-copier-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf index c90d71556224..c40c67e1aaf8 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf @@ -24,8 +24,6 @@ Class.Pipeline."mixout-gain-dai-copier-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf index 9d8c9eebad53..66b7b9c8b1a5 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf @@ -29,8 +29,6 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf index 876d8cf3c46f..87f3e1e34809 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf @@ -29,8 +29,6 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf index 594251d66062..1c9801d89520 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf @@ -24,8 +24,6 @@ Class.Pipeline."mixout-gain-host-copier-capture" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf index 0b895ae36fed..cdd40b90f9af 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf @@ -20,8 +20,6 @@ Class.Pipeline."mixout-mixin" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf index 36a2e29a7824..46d1a6dfc8b9 100644 --- a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf @@ -26,8 +26,6 @@ Class.Pipeline."src-gain-mixin-playback" { - DefineAttribute."index" {} - attributes { diff --git a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf index b804110a921f..dc7805bd0f3e 100644 --- a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf +++ b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf @@ -26,8 +26,6 @@ Class.Pipeline."wov-detect" { - DefineAttribute."index" {} - attributes {