All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] staging: vt6656: Remove unnecessary return values
@ 2016-09-27 18:18 Namrata A Shettar
  2016-09-28  9:36 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 5+ messages in thread
From: Namrata A Shettar @ 2016-09-27 18:18 UTC (permalink / raw)
  To: Forest Bond, Greg Kroah-Hartman, Rithvik Patibandla, outreachy-kernel

Remove unnecessary return values. Change return type of corresponding
functions to 'void' and comments.

Signed-off-by: Namrata A Shettar <namrataashettar@gmail.com>
---
 Changes in v2:
 - combine both patches of prior patchset

 drivers/staging/vt6656/card.c | 22 ++++++----------------
 drivers/staging/vt6656/card.h |  6 +++---
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 13719d1..59bbfd1 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -559,14 +559,12 @@ void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate,
  *  Out:
  *	current_tsf	- Current TSF counter
  *
- * Return Value: true if success; otherwise false
+ * Return Value: none
  *
  */
-bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)
+void vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)
 {
 	*current_tsf = priv->current_tsf;
-
-	return true;
 }
 
 /*
@@ -703,13 +701,11 @@ void vnt_update_next_tbtt(struct vnt_private *priv, u64 tsf,
  *  Out:
  *      none
  *
- * Return Value: true if success; otherwise false
+ * Return Value: none
  *
  */
-int vnt_radio_power_off(struct vnt_private *priv)
+void vnt_radio_power_off(struct vnt_private *priv)
 {
-	int ret = true;
-
 	switch (priv->rf_type) {
 	case RF_AL2230:
 	case RF_AL2230S:
@@ -727,8 +723,6 @@ int vnt_radio_power_off(struct vnt_private *priv)
 	vnt_set_deep_sleep(priv);
 
 	vnt_mac_reg_bits_on(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
-
-	return ret;
 }
 
 /*
@@ -740,12 +734,10 @@ int vnt_radio_power_off(struct vnt_private *priv)
  *  Out:
  *      none
  *
- * Return Value: true if success; otherwise false
+ * Return Value: none
  */
-int vnt_radio_power_on(struct vnt_private *priv)
+void vnt_radio_power_on(struct vnt_private *priv)
 {
-	int ret = true;
-
 	vnt_exit_deep_sleep(priv);
 
 	vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
@@ -763,8 +755,6 @@ int vnt_radio_power_on(struct vnt_private *priv)
 	}
 
 	vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
-
-	return ret;
 }
 
 void vnt_set_bss_mode(struct vnt_private *priv)
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index c2cde7e..84270c1 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -41,14 +41,14 @@ void vnt_update_ifs(struct vnt_private *);
 void vnt_update_top_rates(struct vnt_private *);
 int vnt_ofdm_min_rate(struct vnt_private *);
 void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64);
-bool vnt_get_current_tsf(struct vnt_private *, u64 *);
+void vnt_get_current_tsf(struct vnt_private *, u64 *);
 bool vnt_clear_current_tsf(struct vnt_private *);
 void vnt_reset_next_tbtt(struct vnt_private *, u16);
 void vnt_update_next_tbtt(struct vnt_private *, u64, u16);
 u64 vnt_get_next_tbtt(u64, u16);
 u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2);
-int vnt_radio_power_off(struct vnt_private *);
-int vnt_radio_power_on(struct vnt_private *);
+void vnt_radio_power_off(struct vnt_private *);
+void vnt_radio_power_on(struct vnt_private *);
 u8 vnt_get_pkt_type(struct vnt_private *);
 void vnt_set_bss_mode(struct vnt_private *);
 
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] staging: vt6656: Remove unnecessary return values
  2016-09-27 18:18 [PATCH v2] staging: vt6656: Remove unnecessary return values Namrata A Shettar
@ 2016-09-28  9:36 ` Greg Kroah-Hartman
  2016-09-28 17:27   ` Namrata A Shettar
  0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2016-09-28  9:36 UTC (permalink / raw)
  To: Namrata A Shettar; +Cc: Forest Bond, Rithvik Patibandla, outreachy-kernel

On Tue, Sep 27, 2016 at 11:48:47PM +0530, Namrata A Shettar wrote:
> Remove unnecessary return values. Change return type of corresponding
> functions to 'void' and comments.
> 
> Signed-off-by: Namrata A Shettar <namrataashettar@gmail.com>
> ---
>  Changes in v2:
>  - combine both patches of prior patchset
> 
>  drivers/staging/vt6656/card.c | 22 ++++++----------------
>  drivers/staging/vt6656/card.h |  6 +++---
>  2 files changed, 9 insertions(+), 19 deletions(-)

Doesn't apply to my tree at all :(


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] staging: vt6656: Remove unnecessary return values
  2016-09-28  9:36 ` Greg Kroah-Hartman
@ 2016-09-28 17:27   ` Namrata A Shettar
  2016-09-29  6:21     ` Greg Kroah-Hartman
  0 siblings, 1 reply; 5+ messages in thread
From: Namrata A Shettar @ 2016-09-28 17:27 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Forest Bond, Rithvik Patibandla, outreachy-kernel

On Wed, Sep 28, 2016 at 11:36:06AM +0200, Greg Kroah-Hartman wrote:
> On Tue, Sep 27, 2016 at 11:48:47PM +0530, Namrata A Shettar wrote:
> > Remove unnecessary return values. Change return type of corresponding
> > functions to 'void' and comments.
> > 
> > Signed-off-by: Namrata A Shettar <namrataashettar@gmail.com>
> > ---
> >  Changes in v2:
> >  - combine both patches of prior patchset
> > 
> >  drivers/staging/vt6656/card.c | 22 ++++++----------------
> >  drivers/staging/vt6656/card.h |  6 +++---
> >  2 files changed, 9 insertions(+), 19 deletions(-)
> 
> Doesn't apply to my tree at all :(

Is there a work-around for this? or anything I could have possibly gone
wrong with?

thanks,

namrata


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] staging: vt6656: Remove unnecessary return values
  2016-09-28 17:27   ` Namrata A Shettar
@ 2016-09-29  6:21     ` Greg Kroah-Hartman
  2016-09-29 17:17       ` Namrata A Shettar
  0 siblings, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2016-09-29  6:21 UTC (permalink / raw)
  To: Namrata A Shettar; +Cc: Forest Bond, Rithvik Patibandla, outreachy-kernel

On Wed, Sep 28, 2016 at 10:57:58PM +0530, Namrata A Shettar wrote:
> On Wed, Sep 28, 2016 at 11:36:06AM +0200, Greg Kroah-Hartman wrote:
> > On Tue, Sep 27, 2016 at 11:48:47PM +0530, Namrata A Shettar wrote:
> > > Remove unnecessary return values. Change return type of corresponding
> > > functions to 'void' and comments.
> > > 
> > > Signed-off-by: Namrata A Shettar <namrataashettar@gmail.com>
> > > ---
> > >  Changes in v2:
> > >  - combine both patches of prior patchset
> > > 
> > >  drivers/staging/vt6656/card.c | 22 ++++++----------------
> > >  drivers/staging/vt6656/card.h |  6 +++---
> > >  2 files changed, 9 insertions(+), 19 deletions(-)
> > 
> > Doesn't apply to my tree at all :(
> 
> Is there a work-around for this? or anything I could have possibly gone
> wrong with?

I don't remember, try rebasing to see what the conflicts are, or perhaps
someone else already sent in this same type of change?  We are averaging
about 20-30 patches added to the staging tree each day right now,
sometimes people end up doing the same work at the same time, sorry.

greg k-h


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] staging: vt6656: Remove unnecessary return values
  2016-09-29  6:21     ` Greg Kroah-Hartman
@ 2016-09-29 17:17       ` Namrata A Shettar
  0 siblings, 0 replies; 5+ messages in thread
From: Namrata A Shettar @ 2016-09-29 17:17 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Forest Bond, Rithvik Patibandla, outreachy-kernel

On Thu, Sep 29, 2016 at 08:21:09AM +0200, Greg Kroah-Hartman wrote:
> On Wed, Sep 28, 2016 at 10:57:58PM +0530, Namrata A Shettar wrote:
> > On Wed, Sep 28, 2016 at 11:36:06AM +0200, Greg Kroah-Hartman wrote:
> > > On Tue, Sep 27, 2016 at 11:48:47PM +0530, Namrata A Shettar wrote:
> > > > Remove unnecessary return values. Change return type of corresponding
> > > > functions to 'void' and comments.
> > > > 
> > > > Signed-off-by: Namrata A Shettar <namrataashettar@gmail.com>
> > > > ---
> > > >  Changes in v2:
> > > >  - combine both patches of prior patchset
> > > > 
> > > >  drivers/staging/vt6656/card.c | 22 ++++++----------------
> > > >  drivers/staging/vt6656/card.h |  6 +++---
> > > >  2 files changed, 9 insertions(+), 19 deletions(-)
> > > 
> > > Doesn't apply to my tree at all :(
> > 
> > Is there a work-around for this? or anything I could have possibly gone
> > wrong with?
> 
> I don't remember, try rebasing to see what the conflicts are, or perhaps
> someone else already sent in this same type of change?  We are averaging
> about 20-30 patches added to the staging tree each day right now,
> sometimes people end up doing the same work at the same time, sorry.
> 
> greg k-h

Alright! Thanks for breaking it down for me.


namrata


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-29 17:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-27 18:18 [PATCH v2] staging: vt6656: Remove unnecessary return values Namrata A Shettar
2016-09-28  9:36 ` Greg Kroah-Hartman
2016-09-28 17:27   ` Namrata A Shettar
2016-09-29  6:21     ` Greg Kroah-Hartman
2016-09-29 17:17       ` Namrata A Shettar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.