diff options
| author |   Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-06 23:16:45 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-02-07 02:43:04 -0800 |
| commit | c1889bfe687c22f74d1333913ffe8f8da173d601 (patch) | |
| tree | dff3d16c38181e79437c6d6c82817a127b4de686 /drivers/net/igb/igb_main.c | |
| parent | igb: add link check function (diff) | |
| download | linux-dev-c1889bfe687c22f74d1333913ffe8f8da173d601.tar.xz linux-dev-c1889bfe687c22f74d1333913ffe8f8da173d601.zip | |
igb: make dev_spec a union and remove dynamic allocation
This patch makes dev_spec a union and simplifies it so that it does not
require dynamic allocation and freeing in the driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index b59088eace1d..cb3ac349f3b3 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1329,7 +1329,6 @@ err_eeprom: if (hw->flash_address) iounmap(hw->flash_address); - igb_remove_device(hw); igb_free_queues(adapter); err_sw_init: err_hw_init: @@ -1389,7 +1388,6 @@ static void __devexit igb_remove(struct pci_dev *pdev) if (!igb_check_reset_block(&adapter->hw)) igb_reset_phy(&adapter->hw); - igb_remove_device(&adapter->hw); igb_reset_interrupt_capability(adapter); igb_free_queues(adapter); |