]> git.baikalelectronics.ru Git - kernel.git/commit
iwlagn: merge iwl_pci_down and iwl_pci_remove
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 6 Sep 2011 16:31:17 +0000 (09:31 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Sep 2011 17:56:35 +0000 (13:56 -0400)
commit23a42bdbb07626a956c175a10663f7c6f7fc5ec5
tree4765cb36ba85fc55af0af84c6f4b7e024d592a6e
parenta675aaa8c3a9ed5be5ad72c9dd9958480f54e0a0
iwlagn: merge iwl_pci_down and iwl_pci_remove

The latter was the only place that called the first. The two
functions were split when the iwl_pci_probe called iwl_pci_down
upon failure in the probe. Since iwl_pci_probe undoes its work by
itself, there is no need to split between iwl_pci_down, and
iwl_pci_remove.

Thanks to Pavel Roskin for pointing that out.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-pci.c