Skip to contentSkip to conversation

staging: r8188eu: core: remove the function power_saving_wk_hdl

PATCH In review Saurav Girepunje 4 participants 10 messages Sep 10, 2021 – Sep 25, 2021 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: r8188eu: core: remove the function power_saving_wk_hdl

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

---
 drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -6
index ce73ac7cf973..35e6a943c556 100644
@@ -1669,11 +1669,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
 	return res;
 }
 
-static void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
-{
-	 rtw_ps_processor(padapter);
-}
-
 #ifdef CONFIG_88EU_P2P
 u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
 {
@@ -1941,7 +1936,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
 		dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
 		break;
 	case POWER_SAVING_CTRL_WK_CID:
-		power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+		rtw_ps_processor(padapter);
 		break;
 	case LPS_CTRL_WK_CID:
 		lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);

--
2.32.0

maintainer
#1 lore raw
Quoted 35 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

---
 drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -7
index ce73ac7cf973..35e6a943c556 100644
@@ -1669,11 +1669,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
 	return res;
 }
 
-static void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
-{
-	 rtw_ps_processor(padapter);
-}
-
 #ifdef CONFIG_88EU_P2P
 u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
 {
@@ -1941,7 +1936,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
 		dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
 		break;
 	case POWER_SAVING_CTRL_WK_CID:
-		power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+		rtw_ps_processor(padapter);
 		break;
 	case LPS_CTRL_WK_CID:
 		lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);
--
Quoted 3 lines

2.32.0

Also does not apply to my tree. Please rebase against my staging-next branch and resend.

thanks,

greg k-h

#2 lore raw
Quoted 43 lines · Greg KH
Quoted 35 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

---
  drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -7
index ce73ac7cf973..35e6a943c556 100644
@@ -1669,11 +1669,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
  	return res;
  }
 
-static void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
-{
-	 rtw_ps_processor(padapter);
-}
-
  #ifdef CONFIG_88EU_P2P
  u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
  {
@@ -1941,7 +1936,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
  		dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
  		break;
  	case POWER_SAVING_CTRL_WK_CID:
-		power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+		rtw_ps_processor(padapter);
  		break;
  	case LPS_CTRL_WK_CID:
  		lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);
--
Quoted 3 lines

2.32.0

Also does not apply to my tree. Please rebase against my staging-next branch and resend.

Quoted 4 lines

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help me to understand.When we need to rebase on staging-next. Do we always need to rebase against staging-next..!

Regards,
Saurav Girepunje

maintainer
#3 lore raw
Quoted 48 lines · Saurav Girepunje
Quoted 45 lines · Greg KH
Quoted 35 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

---
  drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -7
index ce73ac7cf973..35e6a943c556 100644
@@ -1669,11 +1669,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
  	return res;
  }
 
-static void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
-{
-	 rtw_ps_processor(padapter);
-}
-
  #ifdef CONFIG_88EU_P2P
  u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
  {
@@ -1941,7 +1936,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
  		dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
  		break;
  	case POWER_SAVING_CTRL_WK_CID:
-		power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+		rtw_ps_processor(padapter);
  		break;
  	case LPS_CTRL_WK_CID:
  		lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type_size);
--
Quoted 3 lines

2.32.0

Also does not apply to my tree. Please rebase against my staging-next branch and resend.

thanks,

Quoted 8 lines
Quoted 2 lines

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help me to understand.When we need to rebase on staging-next. Do we always need to rebase against staging-next..!

Yes, you should. When you are working on code that lots of other people are working on, there will be conflicts like this, and you just need to stay on top of it.

thanks,

greg k-h

#4 lore raw
Quoted 16 lines · CEST Greg KH
Quoted 15 lines · Saurav Girepunje
Quoted 12 lines · Greg KH
Quoted 5 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my staging-next branch and resend.

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help me

to

Quoted 11 lines
Quoted 2 lines

understand.When we need to rebase on staging-next. Do we always need to rebase against staging-next..!

Yes, you should. When you are working on code that lots of other people are working on, there will be conflicts like this, and you just need to stay on top of it.

thanks,

greg k-h

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing. You apply them to staging-testing first and, about 24 hours later, you merge them into staging-next.

In fact I receive two distinct messages, one after the other, when you apply to staging-testing and then to staging-next.

This is the what I've always done here and you haven't ever asked me to rebase against staging-next... So, why are you asking for doing that rebase on staging-next to Saurav?

Thanks,

Fabio

#5 lore raw
Quoted 33 lines · Fabio M. De Francesco
Quoted 16 lines · CEST Greg KH
Quoted 15 lines · Saurav Girepunje
Quoted 12 lines · Greg KH
Quoted 5 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call directly rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my staging-next branch and resend.

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help me

to

Quoted 7 lines
Quoted 2 lines

understand.When we need to rebase on staging-next. Do we always need to rebase against staging-next..!

Yes, you should. When you are working on code that lots of other people are working on, there will be conflicts like this, and you just need to stay on top of it.

Quoted 8 lines
Quoted 4 lines

thanks,

greg k-h

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing.

Nope. It's only you.

The staging-testing branch can be rebased so maybe you will write a patch against something that never makes it to staging-next and everyone will be puzzled.

That's unlikely to happen and we won't be puzzled for long because we try not to invest too much time wondering why patches don't apply.

regards,
dan carpenter

#6 lore raw
Quoted 9 lines · CEST Dan Carpenter
Quoted 8 lines · Fabio M. De Francesco
Quoted 7 lines · CEST Greg KH
Quoted 6 lines · Saurav Girepunje
Quoted 3 lines · Greg KH
Quoted 2 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call

directly

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my staging-

next

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines

branch and resend.

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help

me

Quoted 2 lines
Quoted 2 lines

to

Quoted 1 line
Quoted 1 line

understand.When we need to rebase on staging-next. Do we always need

to

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rebase against staging-next..!

Yes, you should. When you are working on code that lots of other

people

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

are working on, there will be conflicts like this, and you just need to stay on top of it.

thanks,

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

greg k-h

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing.

Nope. It's only you.

And Saurav (at least) :)

I've been misled and in turn I misled Pavel. This is due to a guide in kernelnewbies.org that explicitly says to use staging-testing:

https://kernelnewbies.org/OutreachyfirstpatchSetup

In that page the is a section ("Set up your Linux kernel code repository") which says: "[] Then use the revision control system called git to clone Greg Kroah-Hartman's staging tree repository: git clone -b staging-testing git://
git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git".

I assumed that those instructions must be followed also by developers that are not (anymore) in the Outreachy program.

Obviously, I was wrong in assuming the above.

Thanks for your reply, Dan.

Regards,

Fabio

Quoted 11 lines

The staging-testing branch can be rebased so maybe you will write a patch against something that never makes it to staging-next and everyone will be puzzled.

That's unlikely to happen and we won't be puzzled for long because we try not to invest too much time wondering why patches don't apply.

regards,
dan carpenter

#7 lore raw
Quoted 45 lines · Fabio M. De Francesco
Quoted 9 lines · CEST Dan Carpenter
Quoted 8 lines · Fabio M. De Francesco
Quoted 7 lines · CEST Greg KH
Quoted 6 lines · Saurav Girepunje
Quoted 3 lines · Greg KH
Quoted 2 lines · Saurav Girepunje

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call

directly

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my staging-

next

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines

branch and resend.

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you help

me

Quoted 2 lines
Quoted 2 lines

to

Quoted 1 line
Quoted 1 line

understand.When we need to rebase on staging-next. Do we always need

to

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rebase against staging-next..!

Yes, you should. When you are working on code that lots of other

people

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

are working on, there will be conflicts like this, and you just need to stay on top of it.

thanks,

greg k-h

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing.

Nope. It's only you.

And Saurav (at least) :)

Nope. Saurav is working against something old. You can see the #ifdef CONFIG_88EU_P2P stuff that was removed in commit 102243f893ec ("staging: r8188eu: Remove conditionals CONFIG_88EU_{AP_MODE,P2P}") was applied.

Quoted 10 lines

I've been misled and in turn I misled Pavel. This is due to a guide in kernelnewbies.org that explicitly says to use staging-testing:

https://kernelnewbies.org/OutreachyfirstpatchSetup

In that page the is a section ("Set up your Linux kernel code repository") which says: "[] Then use the revision control system called git to clone Greg Kroah-Hartman's staging tree repository: git clone -b staging-testing git://
git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git".

Huh...

Those aren't *bad* instructions. Working against testing-next is fine, but just be aware that it can rebase.

regards,
dan carpenter

#8 lore raw
Quoted 9 lines · CEST Dan Carpenter
Quoted 8 lines · Fabio M. De Francesco
Quoted 7 lines · CEST Dan Carpenter
Quoted 6 lines · Fabio M. De Francesco
Quoted 5 lines · CEST Greg KH
Quoted 4 lines · Saurav Girepunje
Quoted 1 line · Greg KH

On Fri, Sep 10, 2021 at 11:24:39PM +0530, Saurav Girepunje

Quoted 10 lines · wrote:
Quoted 10 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call

directly

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my

staging-

Quoted 11 lines
Quoted 11 lines

next

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines

branch and resend.

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you

help

Quoted 3 lines
Quoted 3 lines

me

Quoted 2 lines
Quoted 2 lines

to

Quoted 1 line
Quoted 1 line

understand.When we need to rebase on staging-next. Do we always

need

Quoted 6 lines
Quoted 6 lines

to

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rebase against staging-next..!

Yes, you should. When you are working on code that lots of other

people

Quoted 1 line
Quoted 1 line
Quoted 1 line

are working on, there will be conflicts like this, and you just

need to

Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
Quoted 10 lines
Quoted 6 lines

stay on top of it.

thanks,

greg k-h

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing.

Nope. It's only you.

Quoted 8 lines
Quoted 2 lines

And Saurav (at least) :)

Nope. Saurav is working against something old. You can see the #ifdef CONFIG_88EU_P2P stuff that was removed in commit 102243f893ec ("staging: r8188eu: Remove conditionals CONFIG_88EU_{AP_MODE,P2P}") was applied.

Oh, I didn't notice that he was working against something old.

My attention was drawn only by the fact that Greg talked about staging-next, while I was expecting something like "please rebase and resend against my current staging-testing".

Quoted 6 lines
Quoted 6 lines

I've been misled and in turn I misled Pavel. This is due to a guide in kernelnewbies.org that explicitly says to use staging-testing:

https://kernelnewbies.org/OutreachyfirstpatchSetup

In that page the is a section ("Set up your Linux kernel code

repository")

Quoted 1 line
Quoted 1 line

which says: "[] Then use the revision control system called git to clone

Greg

Quoted 1 line
Quoted 1 line

Kroah-Hartman's staging tree repository: git clone -b staging-testing

git://

Quoted 7 lines
Quoted 2 lines

git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git".

Huh...

Those aren't *bad* instructions. Working against testing-next is fine, but just be aware that it can rebase.

Good to know. For what the series Pavel and I submitted we'll complete our work, that is sending v9, against current staging-testing. I suppose we'd better stay consistent.

For new work, since you make notice that we have to "be aware that it [staging-testing] can rebase", we'll switch to staging-next.

Thanks for pointing this out.

Regards,

Fabio

Quoted 5 lines

regards,
dan carpenter

#9 lore raw
Quoted 96 lines · Fabio M. De Francesco
Quoted 9 lines · CEST Dan Carpenter
Quoted 8 lines · Fabio M. De Francesco
Quoted 7 lines · CEST Dan Carpenter
Quoted 6 lines · Fabio M. De Francesco
Quoted 5 lines · CEST Greg KH
Quoted 4 lines · Saurav Girepunje
Quoted 1 line · Greg KH

On Fri, Sep 10, 2021 at 11:24:39PM +0530, Saurav Girepunje

Quoted 10 lines · wrote:
Quoted 10 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Remove the function power_saving_wk_hdl() as it just calling the rtw_ps_processor().Instead of power_saving_wk_hdl() call

directly

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

rtw_ps_processor().

[]

Also does not apply to my tree. Please rebase against my

staging-

Quoted 11 lines
Quoted 11 lines

next

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines

branch and resend.

thanks,

greg k-h

Hi Greg,

I always do rebase against your staging-testing branch. Can you

help

Quoted 3 lines
Quoted 3 lines

me

Quoted 2 lines
Quoted 2 lines

to

Quoted 1 line
Quoted 1 line

understand.When we need to rebase on staging-next. Do we always

need

Quoted 6 lines
Quoted 6 lines

to

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

rebase against staging-next..!

Yes, you should. When you are working on code that lots of other

people

Quoted 1 line
Quoted 1 line
Quoted 1 line

are working on, there will be conflicts like this, and you just

need to

Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
Quoted 10 lines
Quoted 6 lines

stay on top of it.

thanks,

greg k-h

Sorry, Greg. I'm confused... :(

As far as I know, everyone here make patches for staging-testing.

Nope. It's only you.

Quoted 8 lines
Quoted 2 lines

And Saurav (at least) :)

Nope. Saurav is working against something old. You can see the #ifdef CONFIG_88EU_P2P stuff that was removed in commit 102243f893ec ("staging: r8188eu: Remove conditionals CONFIG_88EU_{AP_MODE,P2P}") was applied.

Oh, I didn't notice that he was working against something old.

My attention was drawn only by the fact that Greg talked about staging-next, while I was expecting something like "please rebase and resend against my current staging-testing".

Quoted 6 lines
Quoted 6 lines

I've been misled and in turn I misled Pavel. This is due to a guide in kernelnewbies.org that explicitly says to use staging-testing:

https://kernelnewbies.org/OutreachyfirstpatchSetup

In that page the is a section ("Set up your Linux kernel code

repository")

Quoted 1 line
Quoted 1 line

which says: "[] Then use the revision control system called git to clone

Greg

Quoted 1 line
Quoted 1 line

Kroah-Hartman's staging tree repository: git clone -b staging-testing

git://

Quoted 7 lines
Quoted 2 lines

git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git".

Huh...

Those aren't *bad* instructions. Working against testing-next is fine, but just be aware that it can rebase.

Good to know. For what the series Pavel and I submitted we'll complete our work, that is sending v9, against current staging-testing. I suppose we'd better stay consistent.

Quoted 18 lines

For new work, since you make notice that we have to "be aware that it [staging-testing] can rebase", we'll switch to staging-next.

Thanks for pointing this out.

Regards,

Fabio

Quoted 5 lines

regards,
dan carpenter

I will also do rebase to staging-next.

Thanks Greg, Dan for you clarification.
Thanks Fabio for your input .

Regards,
Saurav