Commit ce9e80af authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: reduce IDI code ifdef 



The code in the two branches of the #ifdef
is almost the same so move the common code
outside the #ifdef.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 706c4ff6

drivers/net/wireless/iwlwifi/iwl-pci.c

+1 −10
Original line number Diff line number Diff line
@@ -278,17 +278,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


#ifdef CONFIG_IWLWIFI_IDI

	iwl_trans = iwl_trans_idi_alloc(shrd, pdev, ent);

	if (iwl_trans == NULL) {

		err = -ENOMEM;

		goto out_free_bus;

	}



	shrd->trans = iwl_trans;

	pci_set_drvdata(pdev, iwl_trans);



	err = iwl_drv_start(shrd, iwl_trans, cfg);

#else

	iwl_trans = iwl_trans_pcie_alloc(shrd, pdev, ent);

#endif

	if (iwl_trans == NULL) {

		err = -ENOMEM;

		goto out_free_bus;
@@ -298,7 +290,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_set_drvdata(pdev, iwl_trans);



	err = iwl_drv_start(shrd, iwl_trans, cfg);

#endif

	if (err)

		goto out_free_trans;