Patchwork : ixgbe: Fix some compiler warnings.

login
register
mail settings
Submitter David Miller
Date March 2, 2009, 4:33 a.m.
Message ID <20090301.203351.249644255.davem@davemloft.net>
Download mbox | patch
Permalink /patch/23919/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - March 2, 2009, 4:33 a.m.
[ Commited to net-next-2.6 ]

'pap' is never used in ixgbe_dcb_hw_config_82599()
and 'eec' in ixgbe_acquire_eeptom() is only used when
status == 0 but GCC has some trouble seeing that.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ixgbe/ixgbe_common.c    |    2 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
Waskiewicz Jr, Peter P - March 2, 2009, 6:40 a.m.
On Sun, 1 Mar 2009, David Miller wrote:

> @@ -661,7 +661,7 @@ static s32 ixgbe_poll_eeprom_eerd_done(struct ixgbe_hw *hw)
>  static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
>  {
>         s32 status = 0;
> -       u32 eec;
> +       u32 eec = 0;
>         u32 i;
> 
>         if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
> diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
> index 1467d56..adcbac4 100644
> --- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
> +++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
> @@ -457,8 +457,6 @@ s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
>  s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
>                                struct ixgbe_dcb_config *dcb_config)
>  {
> -       u32  pap = 0;
> -

Thanks Dave.  We removed the code that used pap since it was used only for 
silicon validation, but we forgot to pull the variable.

Thanks for cleaning these up!

Cheers,
-PJ Waskiewicz
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 26ee8a0..245db0e 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -661,7 +661,7 @@  static s32 ixgbe_poll_eeprom_eerd_done(struct ixgbe_hw *hw)
 static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
 {
 	s32 status = 0;
-	u32 eec;
+	u32 eec = 0;
 	u32 i;
 
 	if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index 1467d56..adcbac4 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -457,8 +457,6 @@  s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
                               struct ixgbe_dcb_config *dcb_config)
 {
-	u32  pap = 0;
-
 	ixgbe_dcb_config_packet_buffers_82599(hw, dcb_config);
 	ixgbe_dcb_config_82599(hw);
 	ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config);