Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0f422e5 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Garzik
Browse files

e1000e: remove inapplicable test for ioport 



There are currently no devices supported by the e1000e driver which need
ioport resources, remove the test for it and all unnecessary code
associated with it (struct e1000_adapter elements, local variables, etc.)

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c43bc57e

drivers/net/e1000e/e1000.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -284,10 +284,6 @@ struct e1000_adapter { 
	unsigned long led_status;

	unsigned long led_status;





	unsigned int flags;

	unsigned int flags;



	/* for ioport free */

	int bars;

	int need_ioport;

};

};





struct e1000_info {

struct e1000_info {

drivers/net/e1000e/netdev.c

+10 −38
Original line number Original line Diff line number Diff line
@@ -3991,9 +3991,6 @@ static int e1000_resume(struct pci_dev *pdev) 
	pci_restore_state(pdev);

	pci_restore_state(pdev);

	e1000e_disable_l1aspm(pdev);

	e1000e_disable_l1aspm(pdev);





	if (adapter->need_ioport)

		err = pci_enable_device(pdev);

	else

	err = pci_enable_device_mem(pdev);

	err = pci_enable_device_mem(pdev);

	if (err) {

	if (err) {

		dev_err(&pdev->dev,

		dev_err(&pdev->dev,
@@ -4096,9 +4093,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) 
	int err;

	int err;





	e1000e_disable_l1aspm(pdev);

	e1000e_disable_l1aspm(pdev);

	if (adapter->need_ioport)

		err = pci_enable_device(pdev);

	else

	err = pci_enable_device_mem(pdev);

	err = pci_enable_device_mem(pdev);

	if (err) {

	if (err) {

		dev_err(&pdev->dev,

		dev_err(&pdev->dev,
@@ -4196,21 +4190,6 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) 
	}

	}

}

}





/**

 * e1000e_is_need_ioport - determine if an adapter needs ioport resources or not

 * @pdev: PCI device information struct

 *

 * Returns true if an adapters needs ioport resources

 **/

static int e1000e_is_need_ioport(struct pci_dev *pdev)

{

	switch (pdev->device) {

	/* Currently there are no adapters that need ioport resources */

	default:

		return false;

	}

}



/**

/**

 * e1000_probe - Device Initialization Routine

 * e1000_probe - Device Initialization Routine

 * @pdev: PCI device information struct

 * @pdev: PCI device information struct
@@ -4236,19 +4215,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	int i, err, pci_using_dac;

	int i, err, pci_using_dac;

	u16 eeprom_data = 0;

	u16 eeprom_data = 0;

	u16 eeprom_apme_mask = E1000_EEPROM_APME;

	u16 eeprom_apme_mask = E1000_EEPROM_APME;

	int bars, need_ioport;





	e1000e_disable_l1aspm(pdev);

	e1000e_disable_l1aspm(pdev);





	/* do not allocate ioport bars when not needed */

	need_ioport = e1000e_is_need_ioport(pdev);

	if (need_ioport) {

		bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);

		err = pci_enable_device(pdev);

	} else {

		bars = pci_select_bars(pdev, IORESOURCE_MEM);

	err = pci_enable_device_mem(pdev);

	err = pci_enable_device_mem(pdev);

	}

	if (err)

	if (err)

		return err;

		return err;
@@ -4271,7 +4241,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
		}

		}

	}

	}





	err = pci_request_selected_regions(pdev, bars, e1000e_driver_name);

	err = pci_request_selected_regions(pdev,

	                                  pci_select_bars(pdev, IORESOURCE_MEM),

	                                  e1000e_driver_name);

	if (err)

	if (err)

		goto err_pci_reg;

		goto err_pci_reg;
@@ -4296,8 +4268,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	adapter->hw.adapter = adapter;

	adapter->hw.adapter = adapter;

	adapter->hw.mac.type = ei->mac;

	adapter->hw.mac.type = ei->mac;

	adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;

	adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;

	adapter->bars = bars;

	adapter->need_ioport = need_ioport;





	mmio_start = pci_resource_start(pdev, 0);

	mmio_start = pci_resource_start(pdev, 0);

	mmio_len = pci_resource_len(pdev, 0);

	mmio_len = pci_resource_len(pdev, 0);
@@ -4536,7 +4506,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
err_ioremap:

err_ioremap:

	free_netdev(netdev);

	free_netdev(netdev);

err_alloc_etherdev:

err_alloc_etherdev:

	pci_release_selected_regions(pdev, bars);

	pci_release_selected_regions(pdev,

	                             pci_select_bars(pdev, IORESOURCE_MEM));

err_pci_reg:

err_pci_reg:

err_dma:

err_dma:

	pci_disable_device(pdev);

	pci_disable_device(pdev);
@@ -4584,7 +4555,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 
	iounmap(adapter->hw.hw_addr);

	iounmap(adapter->hw.hw_addr);

	if (adapter->hw.flash_address)

	if (adapter->hw.flash_address)

		iounmap(adapter->hw.flash_address);

		iounmap(adapter->hw.flash_address);

	pci_release_selected_regions(pdev, adapter->bars);

	pci_release_selected_regions(pdev,

	                             pci_select_bars(pdev, IORESOURCE_MEM));





	free_netdev(netdev);

	free_netdev(netdev);