2017-02-21 10:28:16

by Marcin Rokicki

Subject: [PATCH v2] ath10k: Remove return statement from a void function

The empty 'return;' statement in a void function should be
used to return from somewhere else than the end.

Signed-off-by: Marcin Rokicki <[email protected]>
---

Changes for v2
-remove only return statement instead of empty err label
which can be used in the future

---
drivers/net/wireless/ath/ath10k/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 59729aa..a22d3c9 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2311,7 +2311,7 @@ static void ath10k_core_register_work(struct work_struct *work)
/* TODO: It's probably a good idea to release device from the driver
* but calling device_release_driver() here will cause a deadlock.
*/
- return;
+ ;
}

int ath10k_core_register(struct ath10k *ar, u32 chip_id)
--
2.7.4

2017-02-23 12:55:20

by Joe Perches

Subject: Re: [PATCH v2] ath10k: Remove return statement from a void function

On Wed, 2017-02-22 at 20:54 +0100, Arend Van Spriel wrote:
>
> On 21-2-2017 11:28, Marcin Rokicki wrote:
> > The empty 'return;' statement in a void function should be
> > used to return from somewhere else than the end.
> >
> > Signed-off-by: Marcin Rokicki <[email protected]>
> > ---
> >
> > Changes for v2
> > -remove only return statement instead of empty err label
> > which can be used in the future
> >
> > ---
> > drivers/net/wireless/ath/ath10k/core.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> > index 59729aa..a22d3c9 100644
> > --- a/drivers/net/wireless/ath/ath10k/core.c
> > +++ b/drivers/net/wireless/ath/ath10k/core.c
> > @@ -2311,7 +2311,7 @@ static void ath10k_core_register_work(struct work_struct *work)
> > /* TODO: It's probably a good idea to release device from the driver
> > * but calling device_release_driver() here will cause a deadlock.
> > */
> > - return;
> > + ;
>
> Not exactly what I meant. Just drop the whole line include semicolon.

gcc doesn't support a goto label without a
statement immediately before the end-of-function.

ie:

void foo(void)
{
goto err;
err:
}

fails to compile.

2017-02-22 19:54:53

by Arend Van Spriel

Subject: Re: [PATCH v2] ath10k: Remove return statement from a void function

On 21-2-2017 11:28, Marcin Rokicki wrote:
> The empty 'return;' statement in a void function should be
> used to return from somewhere else than the end.
>
> Signed-off-by: Marcin Rokicki <[email protected]>
> ---
>
> Changes for v2
> -remove only return statement instead of empty err label
> which can be used in the future
>
> ---
> drivers/net/wireless/ath/ath10k/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> index 59729aa..a22d3c9 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -2311,7 +2311,7 @@ static void ath10k_core_register_work(struct work_struct *work)
> /* TODO: It's probably a good idea to release device from the driver
> * but calling device_release_driver() here will cause a deadlock.
> */
> - return;
> + ;

Not exactly what I meant. Just drop the whole line include semicolon.

Regards,
Arend

> }
>
> int ath10k_core_register(struct ath10k *ar, u32 chip_id)
>