[edk2,edk2-staging,16/19] IntelUndiPkg/GigUndiDxe: fix incorrect indentation

Message ID 20181106175833.26964-17-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC
Related show

Commit Message

Ard Biesheuvel Nov. 6, 2018, 5:58 p.m.
Silence a 'misleading indentation' GCC warning by fixing the
incorrect indentation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.19.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Philippe Mathieu-Daudé Nov. 6, 2018, 8:41 p.m. | #1
On 6/11/18 18:58, Ard Biesheuvel wrote:
> Silence a 'misleading indentation' GCC warning by fixing the
> incorrect indentation.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
> index e9fc5394ab28..6ce9ac3c5195 100644
> --- a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
> +++ b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
> @@ -1102,13 +1102,13 @@ STATIC s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
>   	if (!mac->get_link_status)
>   		return E1000_SUCCESS;
>   
> -		/* First we want to see if the MII Status Register reports
> -		 * link.  If so, then we want to get the current speed/duplex
> -		 * of the PHY.
> -		 */
> -		ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
> -		if (ret_val)
> -			return ret_val;
> +	/* First we want to see if the MII Status Register reports
> +	 * link.  If so, then we want to get the current speed/duplex
> +	 * of the PHY.
> +	 */
> +	ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
> +	if (ret_val)
> +		return ret_val;
>   
>   	if (hw->mac.type == e1000_pchlan) {
>   		ret_val = e1000_k1_gig_workaround_hv(hw, link);
>

Patch

diff --git a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
index e9fc5394ab28..6ce9ac3c5195 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
@@ -1102,13 +1102,13 @@  STATIC s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 	if (!mac->get_link_status)
 		return E1000_SUCCESS;
 
-		/* First we want to see if the MII Status Register reports
-		 * link.  If so, then we want to get the current speed/duplex
-		 * of the PHY.
-		 */
-		ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-		if (ret_val)
-			return ret_val;
+	/* First we want to see if the MII Status Register reports
+	 * link.  If so, then we want to get the current speed/duplex
+	 * of the PHY.
+	 */
+	ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
+	if (ret_val)
+		return ret_val;
 
 	if (hw->mac.type == e1000_pchlan) {
 		ret_val = e1000_k1_gig_workaround_hv(hw, link);