[Intel-wired-lan] [PATCH RESEND 1/2] ixgb:Remove reducant error path after call to ixgb_sw_init in the function ixgb_probe

[Intel-wired-lan] [PATCH RESEND 1/2] ixgb:Remove reducant error path after call to ixgb_sw_init in the function ixgb_probe

[Nicholas Krause]

This removes the reducant error path and now no longer used goto
label  err_sw_init after the call to ixgb_probe in the function
ixgb_sw_init after calling this function due to it always returning
zero as it is guarantee to run successfully without any issues.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 31f9145..4a90f36 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -469,9 +469,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	/* setup the private structure */
 
-	err = ixgb_sw_init(adapter);
-	if (err)
-		goto err_sw_init;
+	ixgb_sw_init(adapter);
 
 	netdev->hw_features = NETIF_F_SG |
 			   NETIF_F_TSO |
@@ -531,7 +529,6 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return 0;
 
 err_register:
-err_sw_init:
 err_eeprom:
 	iounmap(adapter->hw.hw_addr);
 err_ioremap:
-- 
2.1.4

[Intel-wired-lan] [PATCH 2/2] ixgb:Make the function ixgb_sw_init void

[Nicholas Krause]

This makes the function ixgb_sw_init void now due to this function
always running successfully and the unnessary error path in the
function ixgb_probe being removed that checks and always gets
the kernel value for success of zero when checking the return

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 4a90f36..fc15a09 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -74,7 +74,7 @@ static int ixgb_init_module(void);
 static void ixgb_exit_module(void);
 static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static void ixgb_remove(struct pci_dev *pdev);
-static int ixgb_sw_init(struct ixgb_adapter *adapter);
+static void ixgb_sw_init(struct ixgb_adapter *adapter);
 static int ixgb_open(struct net_device *netdev);
 static int ixgb_close(struct net_device *netdev);
 static void ixgb_configure_tx(struct ixgb_adapter *adapter);
@@ -577,7 +577,7 @@ ixgb_remove(struct pci_dev *pdev)
  * OS network device settings (MTU size).
  **/
 
-static int
+static void
 ixgb_sw_init(struct ixgb_adapter *adapter)
 {
 	struct ixgb_hw *hw = &adapter->hw;
@@ -608,7 +608,6 @@ ixgb_sw_init(struct ixgb_adapter *adapter)
 	hw->fc.send_xon = 1;
 
 	set_bit(__IXGB_DOWN, &adapter->flags);
-	return 0;
 }
 
 /**
-- 
2.1.4

[Intel-wired-lan] [PATCH RESEND 1/2] ixgb:Remove reducant error path after call to ixgb_sw_init in the function ixgb_probe

[Jeff Kirsher]

On Wed, 2015-10-14 at 18:57 -0400, Nicholas Krause wrote:
> This removes the reducant error path and now no longer used goto
> label  err_sw_init after the call to ixgb_probe in the function
> ixgb_sw_init after calling this function due to it always returning
> zero as it is guarantee to run successfully without any issues.
> 
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

This driver (ixgb), as well as e100 and e1000 are in maintenance mode
which means bug fixes ONLY!

Is this patch necessary?  Answer: No
Is this a bug fix?  Answer: No
Should you have sent this patch?  See answers to previous questions.

Please ask these questions to yourself when putting together a patch
against these drivers (listed above).

With that said, dropping this series.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20151014/61473924/attachment.asc>

[Intel-wired-lan] [PATCH RESEND 1/2] ixgb:Remove reducant error path after call to ixgb_sw_init in the function ixgb_probe

[nick]

On 2015-10-14 09:23 PM, Jeff Kirsher wrote:
> On Wed, 2015-10-14 at 18:57 -0400, Nicholas Krause wrote:
>> This removes the reducant error path and now no longer used goto
>> label  err_sw_init after the call to ixgb_probe in the function
>> ixgb_sw_init after calling this function due to it always returning
>> zero as it is guarantee to run successfully without any issues.
>>
>> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
>> ---
>>  drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +----
>>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> This driver (ixgb), as well as e100 and e1000 are in maintenance mode
> which means bug fixes ONLY!
> 
> Is this patch necessary?  Answer: No
> Is this a bug fix?  Answer: No
> Should you have sent this patch?  See answers to previous questions.
> 
> Please ask these questions to yourself when putting together a patch
> against these drivers (listed above).
> 
> With that said, dropping this series.
> 
Sorry Jeff,
I was not aware that these drivers are in maintenance only mode and therefore thought 
this OK.
Nick