diff mbox series

[1/2] PCI/ASPM: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()

Message ID 20231026121924.2164-1-ilpo.jarvinen@linux.intel.com
State New
Headers
Series [1/2] PCI/ASPM: Simplify pcie_capability_clear_and_set_word() to ..._clear_word() |

Commit Message

Ilpo Järvinen Oct. 26, 2023, 12:19 p.m. UTC 
  When set parameter is 0, pcie_capability_clear_and_set_word() can be
turned into pcie_capability_clear_word() which makes the intent of the
code slightly more obvious.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 drivers/pci/pcie/aspm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Bjorn Helgaas Oct. 26, 2023, 4:29 p.m. UTC | #1 
On Thu, Oct 26, 2023 at 03:19:23PM +0300, Ilpo Järvinen wrote:
> When set parameter is 0, pcie_capability_clear_and_set_word() can be
> turned into pcie_capability_clear_word() which makes the intent of the
> code slightly more obvious.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

Squashed and applied to pci/misc for v6.7, thanks!

> ---
>  drivers/pci/pcie/aspm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 1bf630059264..3b0508b47472 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -689,10 +689,10 @@ static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state)
>  	 * in pcie_config_aspm_link().
>  	 */
>  	if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {
> -		pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,
> -						   PCI_EXP_LNKCTL_ASPM_L1, 0);
> -		pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
> -						   PCI_EXP_LNKCTL_ASPM_L1, 0);
> +		pcie_capability_clear_word(child, PCI_EXP_LNKCTL,
> +					   PCI_EXP_LNKCTL_ASPM_L1);
> +		pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,
> +					   PCI_EXP_LNKCTL_ASPM_L1);
>  	}
>  
>  	val = 0;
> -- 
> 2.30.2
>
diff mbox series

Patch

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 1bf630059264..3b0508b47472 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -689,10 +689,10 @@  static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state)
 	 * in pcie_config_aspm_link().
 	 */
 	if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {
-		pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,
-						   PCI_EXP_LNKCTL_ASPM_L1, 0);
-		pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
-						   PCI_EXP_LNKCTL_ASPM_L1, 0);
+		pcie_capability_clear_word(child, PCI_EXP_LNKCTL,
+					   PCI_EXP_LNKCTL_ASPM_L1);
+		pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,
+					   PCI_EXP_LNKCTL_ASPM_L1);
 	}
 
 	val = 0;