From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Prevent a name conflict (which is surprisingly not caught by the
framework).

Fixes: bd4c8bafcf50 ("power: sequencing: qcom-wcn: improve support for wcn6855")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
 drivers/power/sequencing/pwrseq-qcom-wcn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/sequencing/pwrseq-qcom-wcn.c b/drivers/power/sequencing/pwrseq-qcom-wcn.c
index e8f5030f2639a69254ad5efe0a313d2f3d10fa1d..7d8d6b3407495c28a780d5bb0668b2b35837b48a 100644
--- a/drivers/power/sequencing/pwrseq-qcom-wcn.c
+++ b/drivers/power/sequencing/pwrseq-qcom-wcn.c
@@ -155,7 +155,7 @@ static const struct pwrseq_unit_data pwrseq_qcom_wcn_bt_unit_data = {
 };
 
 static const struct pwrseq_unit_data pwrseq_qcom_wcn6855_bt_unit_data = {
-	.name = "wlan-enable",
+	.name = "bluetooth-enable",
 	.deps = pwrseq_qcom_wcn6855_unit_deps,
 	.enable = pwrseq_qcom_wcn_bt_enable,
 	.disable = pwrseq_qcom_wcn_bt_disable,

---
base-commit: 2ae2aaafb21454f4781c30734959cf223ab486ef
change-id: 20250625-topic-wcn6855_pwrseq-07706f3b3cd8

Best regards,
-- 
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>


On Wed, 25 Jun 2025 17:55:43 +0200, Konrad Dybcio wrote:
> Prevent a name conflict (which is surprisingly not caught by the
> framework).
> 
> 

Applied, thanks!

[1/1] power: sequencing: qcom-wcn: Fix bluetooth-wifi copypasta for WCN6855
      https://git.kernel.org/brgl/linux/c/07d59dec6795428983a840de85aa02febaf7e01b

Best regards,
-- 
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

On Wed, Jun 25, 2025 at 5:55 PM Konrad Dybcio <konradybcio@kernel.org> wrote:
>
> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>
> Prevent a name conflict (which is surprisingly not caught by the
> framework).
>
> Fixes: bd4c8bafcf50 ("power: sequencing: qcom-wcn: improve support for wcn6855")
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> ---
>  drivers/power/sequencing/pwrseq-qcom-wcn.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/power/sequencing/pwrseq-qcom-wcn.c b/drivers/power/sequencing/pwrseq-qcom-wcn.c
> index e8f5030f2639a69254ad5efe0a313d2f3d10fa1d..7d8d6b3407495c28a780d5bb0668b2b35837b48a 100644
> --- a/drivers/power/sequencing/pwrseq-qcom-wcn.c
> +++ b/drivers/power/sequencing/pwrseq-qcom-wcn.c
> @@ -155,7 +155,7 @@ static const struct pwrseq_unit_data pwrseq_qcom_wcn_bt_unit_data = {
>  };
>
>  static const struct pwrseq_unit_data pwrseq_qcom_wcn6855_bt_unit_data = {
> -       .name = "wlan-enable",
> +       .name = "bluetooth-enable",
>         .deps = pwrseq_qcom_wcn6855_unit_deps,
>         .enable = pwrseq_qcom_wcn_bt_enable,
>         .disable = pwrseq_qcom_wcn_bt_disable,
>
> ---

Thanks for the catch. Unlike target names, the unit names are mostly
for human convenience. That's why it didn't really break anything. If
you have no objections, I will queue it for v6.17 as I have already a
bunch of changes queued up and there's no point bothering Torvalds
with a one-liner that's not urgent.

Bartosz

On 6/25/25 9:14 PM, Bartosz Golaszewski wrote:
> On Wed, Jun 25, 2025 at 5:55 PM Konrad Dybcio <konradybcio@kernel.org> wrote:
>>
>> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>>
>> Prevent a name conflict (which is surprisingly not caught by the
>> framework).
>>
>> Fixes: bd4c8bafcf50 ("power: sequencing: qcom-wcn: improve support for wcn6855")
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>> ---
>>  drivers/power/sequencing/pwrseq-qcom-wcn.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/power/sequencing/pwrseq-qcom-wcn.c b/drivers/power/sequencing/pwrseq-qcom-wcn.c
>> index e8f5030f2639a69254ad5efe0a313d2f3d10fa1d..7d8d6b3407495c28a780d5bb0668b2b35837b48a 100644
>> --- a/drivers/power/sequencing/pwrseq-qcom-wcn.c
>> +++ b/drivers/power/sequencing/pwrseq-qcom-wcn.c
>> @@ -155,7 +155,7 @@ static const struct pwrseq_unit_data pwrseq_qcom_wcn_bt_unit_data = {
>>  };
>>
>>  static const struct pwrseq_unit_data pwrseq_qcom_wcn6855_bt_unit_data = {
>> -       .name = "wlan-enable",
>> +       .name = "bluetooth-enable",
>>         .deps = pwrseq_qcom_wcn6855_unit_deps,
>>         .enable = pwrseq_qcom_wcn_bt_enable,
>>         .disable = pwrseq_qcom_wcn_bt_disable,
>>
>> ---
> 
> Thanks for the catch. Unlike target names, the unit names are mostly
> for human convenience. That's why it didn't really break anything. If
> you have no objections, I will queue it for v6.17 as I have already a
> bunch of changes queued up and there's no point bothering Torvalds
> with a one-liner that's not urgent.

No worries

Konrad