linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] iwlwifi: mvm: remove some dead code
@ 2015-05-07  9:58 Dan Carpenter
  2015-05-07 12:27 ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2015-05-07  9:58 UTC (permalink / raw)
  To: Johannes Berg, Eran Harary
  Cc: Emmanuel Grumbach, Intel Linux Wireless, Kalle Valo, Arik Nemtsov,
	Luciano Coelho, Liad Kaufman, linux-wireless, kernel-janitors

"ret" is zero here so we can remove this stray check.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index df86963..41f4763 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_start_hw(mvm->trans, false);
-		if (ret)
-			return ret;
 	}
 
 	if (iwlmvm_mod_params.init_dbg)

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [patch] iwlwifi: mvm: remove some dead code
  2015-05-07  9:58 [patch] iwlwifi: mvm: remove some dead code Dan Carpenter
@ 2015-05-07 12:27 ` Johannes Berg
  2015-05-07 12:42   ` Dan Carpenter
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2015-05-07 12:27 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Eran Harary, Emmanuel Grumbach, Intel Linux Wireless, Kalle Valo,
	Arik Nemtsov, Luciano Coelho, Liad Kaufman, linux-wireless,
	kernel-janitors

On Thu, 2015-05-07 at 12:58 +0300, Dan Carpenter wrote:
> "ret" is zero here so we can remove this stray check.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
> index df86963..41f4763 100644
> --- a/drivers/net/wireless/iwlwifi/mvm/fw.c
> +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
> @@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
>  		 */
>  		_iwl_trans_stop_device(mvm->trans, false);
>  		_iwl_trans_start_hw(mvm->trans, false);
> -		if (ret)
> -			return ret;

It looks like "ret = _iwl_trans_start_hw(...)" was intended though?

johannes


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] iwlwifi: mvm: remove some dead code
  2015-05-07 12:27 ` Johannes Berg
@ 2015-05-07 12:42   ` Dan Carpenter
  2015-05-07 12:47     ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2015-05-07 12:42 UTC (permalink / raw)
  To: Johannes Berg
  Cc: Eran Harary, Emmanuel Grumbach, Intel Linux Wireless, Kalle Valo,
	Arik Nemtsov, Luciano Coelho, Liad Kaufman, linux-wireless,
	kernel-janitors

On Thu, May 07, 2015 at 02:27:15PM +0200, Johannes Berg wrote:
> On Thu, 2015-05-07 at 12:58 +0300, Dan Carpenter wrote:
> > "ret" is zero here so we can remove this stray check.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
> > index df86963..41f4763 100644
> > --- a/drivers/net/wireless/iwlwifi/mvm/fw.c
> > +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
> > @@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
> >  		 */
> >  		_iwl_trans_stop_device(mvm->trans, false);
> >  		_iwl_trans_start_hw(mvm->trans, false);
> > -		if (ret)
> > -			return ret;
> 
> It looks like "ret = _iwl_trans_start_hw(...)" was intended though?
> 

Hm...  You may be right.  Should it also be "goto error;" instead of a
direct return?  I'm not positive.  Eran can you fix this and give me a
Reported-by tag?

regards,
dan carpenter


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] iwlwifi: mvm: remove some dead code
  2015-05-07 12:42   ` Dan Carpenter
@ 2015-05-07 12:47     ` Johannes Berg
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2015-05-07 12:47 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Eran Harary, Emmanuel Grumbach, Intel Linux Wireless, Kalle Valo,
	Arik Nemtsov, Luciano Coelho, Liad Kaufman, linux-wireless,
	kernel-janitors

On Thu, 2015-05-07 at 15:42 +0300, Dan Carpenter wrote:

> > >  		_iwl_trans_stop_device(mvm->trans, false);
> > >  		_iwl_trans_start_hw(mvm->trans, false);
> > > -		if (ret)
> > > -			return ret;
> > 
> > It looks like "ret = _iwl_trans_start_hw(...)" was intended though?
> > 
> 
> Hm...  You may be right.  Should it also be "goto error;" instead of a
> direct return?  I'm not positive.

Yes, looks like.

> Eran can you fix this and give me a Reported-by tag?

I think Eran is on sabbatical, I'll get this on the way internally with
your reported-by.

johannes


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-05-07 12:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-07  9:58 [patch] iwlwifi: mvm: remove some dead code Dan Carpenter
2015-05-07 12:27 ` Johannes Berg
2015-05-07 12:42   ` Dan Carpenter
2015-05-07 12:47     ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).