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

Commit 6379103e authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: remove unused IDI code stubs 



These stubs are from internal experimental code
and aren't needed in the driver in the kernel
so just remove them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c5d47221

drivers/net/wireless/iwlwifi/pcie/drv.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -263,8 +263,6 @@ MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids); 
/* PCI registers */

/* PCI registers */

#define PCI_CFG_RETRY_TIMEOUT	0x041

#define PCI_CFG_RETRY_TIMEOUT	0x041





#ifndef CONFIG_IWLWIFI_IDI



static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

{

	const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);

	const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
@@ -307,8 +305,6 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) 
	pci_set_drvdata(pdev, NULL);

	pci_set_drvdata(pdev, NULL);

}

}





#endif /* CONFIG_IWLWIFI_IDI */



#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP





static int iwl_pci_suspend(struct device *device)

static int iwl_pci_suspend(struct device *device)
@@ -353,15 +349,6 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); 




#endif

#endif





#ifdef CONFIG_IWLWIFI_IDI

/*

 * Defined externally in iwl-idi.c

 */

int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

void __devexit iwl_pci_remove(struct pci_dev *pdev);



#endif /* CONFIG_IWLWIFI_IDI */



static struct pci_driver iwl_pci_driver = {

static struct pci_driver iwl_pci_driver = {

	.name = DRV_NAME,

	.name = DRV_NAME,

	.id_table = iwl_hw_card_ids,

	.id_table = iwl_hw_card_ids,

drivers/net/wireless/iwlwifi/pcie/rx.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -35,10 +35,6 @@ 
#include "internal.h"

#include "internal.h"

#include "iwl-op-mode.h"

#include "iwl-op-mode.h"





#ifdef CONFIG_IWLWIFI_IDI

#include "iwl-amfh.h"

#endif



/******************************************************************************

/******************************************************************************

 *

 *

 * RX path functions

 * RX path functions
@@ -723,11 +719,9 @@ void iwl_irq_tasklet(struct iwl_trans *trans) 
		/* Disable periodic interrupt; we use it as just a one-shot. */

		/* Disable periodic interrupt; we use it as just a one-shot. */

		iwl_write8(trans, CSR_INT_PERIODIC_REG,

		iwl_write8(trans, CSR_INT_PERIODIC_REG,

			    CSR_INT_PERIODIC_DIS);

			    CSR_INT_PERIODIC_DIS);

#ifdef CONFIG_IWLWIFI_IDI



		iwl_amfh_rx_handler();

#else

		iwl_rx_handle(trans);

		iwl_rx_handle(trans);

#endif



		/*

		/*

		 * Enable periodic interrupt in 8 msec only if we received

		 * Enable periodic interrupt in 8 msec only if we received

		 * real RX interrupt (instead of just periodic int), to catch

		 * real RX interrupt (instead of just periodic int), to catch

drivers/net/wireless/iwlwifi/pcie/trans.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -855,10 +855,8 @@ static int iwl_nic_init(struct iwl_trans *trans) 




	iwl_op_mode_nic_config(trans->op_mode);

	iwl_op_mode_nic_config(trans->op_mode);





#ifndef CONFIG_IWLWIFI_IDI

	/* Allocate the RX queue, or reset if it is already allocated */

	/* Allocate the RX queue, or reset if it is already allocated */

	iwl_rx_init(trans);

	iwl_rx_init(trans);

#endif





	/* Allocate or reset and init all Tx and Command queues */

	/* Allocate or reset and init all Tx and Command queues */

	if (iwl_tx_init(trans))

	if (iwl_tx_init(trans))
@@ -1184,9 +1182,8 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) 
	 */

	 */

	if (test_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status)) {

	if (test_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status)) {

		iwl_trans_tx_stop(trans);

		iwl_trans_tx_stop(trans);

#ifndef CONFIG_IWLWIFI_IDI

		iwl_trans_rx_stop(trans);

		iwl_trans_rx_stop(trans);

#endif



		/* Power-down device's busmaster DMA clocks */

		/* Power-down device's busmaster DMA clocks */

		iwl_write_prph(trans, APMG_CLK_DIS_REG,

		iwl_write_prph(trans, APMG_CLK_DIS_REG,

			       APMG_CLK_VAL_DMA_CLK_RQT);

			       APMG_CLK_VAL_DMA_CLK_RQT);
@@ -1551,9 +1548,8 @@ void iwl_trans_pcie_free(struct iwl_trans *trans) 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);





	iwl_trans_pcie_tx_free(trans);

	iwl_trans_pcie_tx_free(trans);

#ifndef CONFIG_IWLWIFI_IDI

	iwl_trans_pcie_rx_free(trans);

	iwl_trans_pcie_rx_free(trans);

#endif



	if (trans_pcie->irq_requested == true) {

	if (trans_pcie->irq_requested == true) {

		free_irq(trans_pcie->irq, trans);

		free_irq(trans_pcie->irq, trans);

		iwl_free_isr_ict(trans);

		iwl_free_isr_ict(trans);