diff mbox series

igb: Convert a series of if statements to switch case

Message ID 20220510025755.19047-1-xiaolinkui@kylinos.cn
State Superseded
Headers show
Series igb: Convert a series of if statements to switch case | expand

Commit Message

xiaolinkui May 10, 2022, 2:57 a.m. UTC
From: Linkui Xiao<xiaolinkui@kylinos.cn>

Convert a series of if statements that handle different events to
a switch case statement to simplify the code.

Signed-off-by: Linkui Xiao<xiaolinkui@kylinos.cn>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Paul Menzel May 11, 2022, 6:32 a.m. UTC | #1
Dear Linkui,


Thank you for your patch.

Am 10.05.22 um 04:57 schrieb xiaolinkui:
> From: Linkui Xiao<xiaolinkui@kylinos.cn>

Please add a space before the <.

> Convert a series of if statements that handle different events to
> a switch case statement to simplify the code.

(Nit: Please use 75 characters per line.)

> Signed-off-by: Linkui Xiao<xiaolinkui@kylinos.cn>
> ---
>   drivers/net/ethernet/intel/igb/igb_main.c | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index 34b33b21e0dc..4ce0718eeff6 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -4588,13 +4588,17 @@ static inline void igb_set_vf_vlan_strip(struct igb_adapter *adapter,
>   	struct e1000_hw *hw = &adapter->hw;
>   	u32 val, reg;
>   
> -	if (hw->mac.type < e1000_82576)
> +	switch (hw->mac.type) {
> +	case e1000_undefined:
> +	case e1000_82575:
>   		return;
> -
> -	if (hw->mac.type == e1000_i350)
> +	case e1000_i350:
>   		reg = E1000_DVMOLR(vfn);
> -	else
> +		break;
> +	default:
>   		reg = E1000_VMOLR(vfn);
> +		break;
> +	}
>   
>   	val = rd32(reg);
>   	if (enable)

Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>


Kind regards,

Paul
xiaolinkui May 11, 2022, 9:13 a.m. UTC | #2
Dear Paul:

Thank you for your reply and suggestions, I will send the V2 version soon.

On 5/11/22 14:32, Paul Menzel wrote:
> Dear Linkui,
>
>
> Thank you for your patch.
>
> Am 10.05.22 um 04:57 schrieb xiaolinkui:
>> From: Linkui Xiao<xiaolinkui@kylinos.cn>
>
> Please add a space before the <.
>
>> Convert a series of if statements that handle different events to
>> a switch case statement to simplify the code.
>
> (Nit: Please use 75 characters per line.)
>
>> Signed-off-by: Linkui Xiao<xiaolinkui@kylinos.cn>
>> ---
>>   drivers/net/ethernet/intel/igb/igb_main.c | 12 ++++++++----
>>   1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
>> b/drivers/net/ethernet/intel/igb/igb_main.c
>> index 34b33b21e0dc..4ce0718eeff6 100644
>> --- a/drivers/net/ethernet/intel/igb/igb_main.c
>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
>> @@ -4588,13 +4588,17 @@ static inline void 
>> igb_set_vf_vlan_strip(struct igb_adapter *adapter,
>>       struct e1000_hw *hw = &adapter->hw;
>>       u32 val, reg;
>>   -    if (hw->mac.type < e1000_82576)
>> +    switch (hw->mac.type) {
>> +    case e1000_undefined:
>> +    case e1000_82575:
>>           return;
>> -
>> -    if (hw->mac.type == e1000_i350)
>> +    case e1000_i350:
>>           reg = E1000_DVMOLR(vfn);
>> -    else
>> +        break;
>> +    default:
>>           reg = E1000_VMOLR(vfn);
>> +        break;
>> +    }
>>         val = rd32(reg);
>>       if (enable)
>
> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
>
>
> Kind regards,
>
> Paul
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 34b33b21e0dc..4ce0718eeff6 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4588,13 +4588,17 @@  static inline void igb_set_vf_vlan_strip(struct igb_adapter *adapter,
 	struct e1000_hw *hw = &adapter->hw;
 	u32 val, reg;
 
-	if (hw->mac.type < e1000_82576)
+	switch (hw->mac.type) {
+	case e1000_undefined:
+	case e1000_82575:
 		return;
-
-	if (hw->mac.type == e1000_i350)
+	case e1000_i350:
 		reg = E1000_DVMOLR(vfn);
-	else
+		break;
+	default:
 		reg = E1000_VMOLR(vfn);
+		break;
+	}
 
 	val = rd32(reg);
 	if (enable)