| Message ID | 1621306352-3632-1-git-send-email-tiantao6@hisilicon.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 233bc283728241aa522fd2889649261b742cee5a |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ssb: remove unreachable code | expand |
On Tue, 18 May 2021 10:52:32 +0800 Tian Tao <tiantao6@hisilicon.com> 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 <m@bues.ch>
在 2021/5/21 0:51, Michael Büsch 写道: > On Tue, 18 May 2021 10:52:32 +0800 > Tian Tao <tiantao6@hisilicon.com> 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 <m@bues.ch> >
"tiantao (H)" <tiantao6@huawei.com> writes: > 在 2021/5/21 0:51, Michael Büsch 写道: >> On Tue, 18 May 2021 10:52:32 +0800 >> Tian Tao <tiantao6@hisilicon.com> 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.
Tian Tao <tiantao6@hisilicon.com> 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 <tiantao6@hisilicon.com> > Acked-by: Michael Büsch <m@bues.ch> Patch applied to wireless-drivers-next.git, thanks. 233bc2837282 ssb: remove unreachable code
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();
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 <tiantao6@hisilicon.com> --- drivers/ssb/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)