diff mbox series

igb: Fix styling in enable/disable SR-IOV

Message ID Zw2mTeDYEkWnh36A@Fantasy-Ubuntu
State Rejected
Headers show
Series igb: Fix styling in enable/disable SR-IOV | expand

Commit Message

Johnny Park Oct. 14, 2024, 11:16 p.m. UTC
This patch fixes the checks and warnings for igb_enable_sriov and
igb_disable_sriov function reported by checkpatch.pl

Signed-off-by: Johnny Park <pjohnny0508@gmail.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Jakub Kicinski Oct. 16, 2024, 12:46 a.m. UTC | #1
On Mon, 14 Oct 2024 17:16:29 -0600 Johnny Park wrote:
> This patch fixes the checks and warnings for igb_enable_sriov and
> igb_disable_sriov function reported by checkpatch.pl

Quoting documentation:

  Clean-up patches
  ~~~~~~~~~~~~~~~~
  
  Netdev discourages patches which perform simple clean-ups, which are not in
  the context of other work. For example:
  
  * Addressing ``checkpatch.pl`` warnings
  * Addressing :ref:`Local variable ordering<rcs>` issues
  * Conversions to device-managed APIs (``devm_`` helpers)
  
  This is because it is felt that the churn that such changes produce comes
  at a greater cost than the value of such clean-ups.
  
  Conversely, spelling and grammar fixes are not discouraged.
  
See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#clean-up-patches
Johnny Park Oct. 16, 2024, 3:57 a.m. UTC | #2
On 10/15/24 18:46, Jakub Kicinski wrote:

> On Mon, 14 Oct 2024 17:16:29 -0600 Johnny Park wrote:
>> This patch fixes the checks and warnings for igb_enable_sriov and
>> igb_disable_sriov function reported by checkpatch.pl
> Quoting documentation:
>
>    Clean-up patches
>    ~~~~~~~~~~~~~~~~
>    
>    Netdev discourages patches which perform simple clean-ups, which are not in
>    the context of other work. For example:
>    
>    * Addressing ``checkpatch.pl`` warnings
>    * Addressing :ref:`Local variable ordering<rcs>` issues
>    * Conversions to device-managed APIs (``devm_`` helpers)
>    
>    This is because it is felt that the churn that such changes produce comes
>    at a greater cost than the value of such clean-ups.
>    
>    Conversely, spelling and grammar fixes are not discouraged.
>    
> See:https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#clean-up-patches
I'm quite new to this area so I must have missed that portion of 
documentation. Apologies for the inconvenience.
Johnny Park Oct. 16, 2024, 4:02 a.m. UTC | #3
On Tue, Oct 15, 2024 at 05:46:07PM -0700, Jakub Kicinski wrote:
> On Mon, 14 Oct 2024 17:16:29 -0600 Johnny Park wrote:
> > This patch fixes the checks and warnings for igb_enable_sriov and
> > igb_disable_sriov function reported by checkpatch.pl
> 
> Quoting documentation:
> 
>   Clean-up patches
>   ~~~~~~~~~~~~~~~~
>   
>   Netdev discourages patches which perform simple clean-ups, which are not in
>   the context of other work. For example:
>   
>   * Addressing ``checkpatch.pl`` warnings
>   * Addressing :ref:`Local variable ordering<rcs>` issues
>   * Conversions to device-managed APIs (``devm_`` helpers)
>   
>   This is because it is felt that the churn that such changes produce comes
>   at a greater cost than the value of such clean-ups.
>   
>   Conversely, spelling and grammar fixes are not discouraged.
>   
> See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#clean-up-patches
I see. Apologies for the inconvenience, I'm new to this area so I must have missed that portion of documentation.
Jacob Keller Oct. 16, 2024, 10:54 p.m. UTC | #4
On 10/15/2024 9:02 PM, Johnny Park wrote:
> On Tue, Oct 15, 2024 at 05:46:07PM -0700, Jakub Kicinski wrote:
>> On Mon, 14 Oct 2024 17:16:29 -0600 Johnny Park wrote:
>>> This patch fixes the checks and warnings for igb_enable_sriov and
>>> igb_disable_sriov function reported by checkpatch.pl
>>
>> Quoting documentation:
>>
>>   Clean-up patches
>>   ~~~~~~~~~~~~~~~~
>>   
>>   Netdev discourages patches which perform simple clean-ups, which are not in
>>   the context of other work. For example:
>>   
>>   * Addressing ``checkpatch.pl`` warnings
>>   * Addressing :ref:`Local variable ordering<rcs>` issues
>>   * Conversions to device-managed APIs (``devm_`` helpers)
>>   
>>   This is because it is felt that the churn that such changes produce comes
>>   at a greater cost than the value of such clean-ups.
>>   
>>   Conversely, spelling and grammar fixes are not discouraged.
>>   
>> See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#clean-up-patches
> I see. Apologies for the inconvenience, I'm new to this area so I must have missed that portion of documentation.

You likely missed this because its a recent addition to the docs by
commit aeb218d900e3 ("docs: netdev: document guidance on cleanup
patches") from a week ago.

The policy itself is older than this, but we've had a recent surge in
similar changes on a few drivers.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 1ef4cb871452..5a3b10b81848 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3703,10 +3703,10 @@  static int igb_disable_sriov(struct pci_dev *pdev, bool reinit)
 			dev_warn(&pdev->dev,
 				 "Cannot deallocate SR-IOV virtual functions while they are assigned - VFs will not be deallocated\n");
 			return -EPERM;
-		} else {
-			pci_disable_sriov(pdev);
-			msleep(500);
 		}
+
+		pci_disable_sriov(pdev);
+		msleep(500);
 		spin_lock_irqsave(&adapter->vfs_lock, flags);
 		kfree(adapter->vf_mac_list);
 		adapter->vf_mac_list = NULL;
@@ -3739,6 +3739,7 @@  static int igb_enable_sriov(struct pci_dev *pdev, int num_vfs, bool reinit)
 		err = -EPERM;
 		goto out;
 	}
+
 	if (!num_vfs)
 		goto out;
 
@@ -3746,11 +3747,13 @@  static int igb_enable_sriov(struct pci_dev *pdev, int num_vfs, bool reinit)
 		dev_info(&pdev->dev, "%d pre-allocated VFs found - override max_vfs setting of %d\n",
 			 old_vfs, max_vfs);
 		adapter->vfs_allocated_count = old_vfs;
-	} else
+	} else {
 		adapter->vfs_allocated_count = num_vfs;
+	}
 
 	adapter->vf_data = kcalloc(adapter->vfs_allocated_count,
-				sizeof(struct vf_data_storage), GFP_KERNEL);
+				   sizeof(struct vf_data_storage),
+				   GFP_KERNEL);
 
 	/* if allocation failed then we do not support SR-IOV */
 	if (!adapter->vf_data) {