Commit 9e7bd330 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files

ixgb: clean up assignments inside if statements 



Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent fc2d14e3

drivers/net/ixgb/ixgb_main.c

+16 −10
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int i;

	int err;



	if ((err = pci_enable_device(pdev)))

	err = pci_enable_device(pdev);

	if (err)

		return err;



	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
@@ -371,7 +372,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		pci_using_dac = 0;

	}



	if ((err = pci_request_regions(pdev, ixgb_driver_name)))

	err = pci_request_regions(pdev, ixgb_driver_name);

	if (err)

		goto err_request_regions;



	pci_set_master(pdev);
@@ -435,7 +437,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* setup the private structure */



	if ((err = ixgb_sw_init(adapter)))

	err = ixgb_sw_init(adapter);

	if (err)

		goto err_sw_init;



	netdev->features = NETIF_F_SG |
@@ -474,7 +477,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);



	strcpy(netdev->name, "eth%d");

	if ((err = register_netdev(netdev)))

	err = register_netdev(netdev);

	if (err)

		goto err_register;



	/* we're going to reset, so assume we have no link for now */
@@ -594,16 +598,18 @@ ixgb_open(struct net_device *netdev) 
	int err;



	/* allocate transmit descriptors */



	if ((err = ixgb_setup_tx_resources(adapter)))

	err = ixgb_setup_tx_resources(adapter);

	if (err)

		goto err_setup_tx;



	/* allocate receive descriptors */



	if ((err = ixgb_setup_rx_resources(adapter)))

	err = ixgb_setup_rx_resources(adapter);

	if (err)

		goto err_setup_rx;



	if ((err = ixgb_up(adapter)))

	err = ixgb_up(adapter);

	if (err)

		goto err_up;



	return 0;