2021-05-19 10:50:40

by Tian Tao

[permalink] [raw]
Subject: [PATCH] ssb: remove unreachable code

The return value of ssb_bus_unregister can only be 0 or 1, so this
condition if (err == -EBUSY) will not hold, so delete it.

Signed-off-by: Tian Tao <[email protected]>
---
drivers/ssb/main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 0a26984..8fcf53c 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -431,9 +431,7 @@ void ssb_bus_unregister(struct ssb_bus *bus)
int err;

err = ssb_gpio_unregister(bus);
- if (err == -EBUSY)
- pr_debug("Some GPIOs are still in use\n");
- else if (err)
+ if (err)
pr_debug("Can not unregister GPIO driver: %i\n", err);

ssb_buses_lock();
--
2.7.4



2021-05-21 06:33:03

by Michael Büsch

[permalink] [raw]
Subject: Re: [PATCH] ssb: remove unreachable code

On Tue, 18 May 2021 10:52:32 +0800
Tian Tao <[email protected]> wrote:

> The return value of ssb_bus_unregister can only be 0 or 1, so this
> condition if (err == -EBUSY) will not hold, so delete it.

> @@ -431,9 +431,7 @@ void ssb_bus_unregister(struct ssb_bus *bus)
> int err;
>
> err = ssb_gpio_unregister(bus);
> - if (err == -EBUSY)
> - pr_debug("Some GPIOs are still in use\n");
> - else if (err)
> + if (err)
> pr_debug("Can not unregister GPIO driver: %i\n", err);
>
> ssb_buses_lock();

Good catch.
Minor correction: The return value can be 0 or -1.

Acked-by: Michael Büsch <[email protected]>

--
Michael


Attachments:
(No filename) (849.00 B)
OpenPGP digital signature

2021-05-21 08:55:27

by tiantao (H)

[permalink] [raw]
Subject: Re: [PATCH] ssb: remove unreachable code


在 2021/5/21 0:51, Michael Büsch 写道:
> On Tue, 18 May 2021 10:52:32 +0800
> Tian Tao <[email protected]> wrote:
>
>> The return value of ssb_bus_unregister can only be 0 or 1, so this
>> condition if (err == -EBUSY) will not hold, so delete it.
>> @@ -431,9 +431,7 @@ void ssb_bus_unregister(struct ssb_bus *bus)
>> int err;
>>
>> err = ssb_gpio_unregister(bus);
>> - if (err == -EBUSY)
>> - pr_debug("Some GPIOs are still in use\n");
>> - else if (err)
>> + if (err)
>> pr_debug("Can not unregister GPIO driver: %i\n", err);
>>
>> ssb_buses_lock();
> Good catch.
> Minor correction: The return value can be 0 or -1.
yes, you are right. thanks again.:-)
>
> Acked-by: Michael Büsch <[email protected]>
>

2021-05-21 09:34:18

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] ssb: remove unreachable code

"tiantao (H)" <[email protected]> writes:

> 在 2021/5/21 0:51, Michael Büsch 写道:
>> On Tue, 18 May 2021 10:52:32 +0800
>> Tian Tao <[email protected]> wrote:
>>
>>> The return value of ssb_bus_unregister can only be 0 or 1, so this
>>> condition if (err == -EBUSY) will not hold, so delete it.
>>> @@ -431,9 +431,7 @@ void ssb_bus_unregister(struct ssb_bus *bus)
>>> int err;
>>> err = ssb_gpio_unregister(bus);
>>> - if (err == -EBUSY)
>>> - pr_debug("Some GPIOs are still in use\n");
>>> - else if (err)
>>> + if (err)
>>> pr_debug("Can not unregister GPIO driver: %i\n", err);
>>> ssb_buses_lock();
>> Good catch.
>> Minor correction: The return value can be 0 or -1.
>
> yes, you are right. thanks again.:-)

I'll fix the commit log to match that.

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-06-15 10:12:11

by Kalle Valo

[permalink] [raw]
Subject: Re: ssb: remove unreachable code

Tian Tao <[email protected]> wrote:

> The return value of ssb_bus_unregister can only be 0 or -1, so this
> condition if (err == -EBUSY) will not hold, so delete it.
>
> Signed-off-by: Tian Tao <[email protected]>
> Acked-by: Michael Büsch <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

233bc2837282 ssb: remove unreachable code

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches