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

Commit 5fdda047 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: remove transport suspend/resume indirection 



There's no reason for the transport to call itself through
indirect function pointers, inline the (little) code there
is and remove the indirection completely.

Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1092b9bc

drivers/net/wireless/iwlwifi/iwl-trans.h

+1 −18
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ struct iwl_trans; 
 *	May sleep

 * @dbgfs_register: add the dbgfs files under this directory. Files will be

 *	automatically deleted.

 * @suspend: stop the device unless WoWLAN is configured

 * @resume: resume activity of the device

 * @write8: write a u8 to a register at offset ofs from the BAR

 * @write32: write a u32 to a register at offset ofs from the BAR

 * @read32: read a u32 register at offset ofs from the BAR
@@ -443,10 +441,7 @@ struct iwl_trans_ops { 


	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);

	int (*wait_tx_queue_empty)(struct iwl_trans *trans);

#ifdef CONFIG_PM_SLEEP

	int (*suspend)(struct iwl_trans *trans);

	int (*resume)(struct iwl_trans *trans);

#endif



	void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val);

	void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val);

	u32 (*read32)(struct iwl_trans *trans, u32 ofs);
@@ -700,18 +695,6 @@ static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans, 
	return trans->ops->dbgfs_register(trans, dir);

}



#ifdef CONFIG_PM_SLEEP

static inline int iwl_trans_suspend(struct iwl_trans *trans)

{

	return trans->ops->suspend(trans);

}



static inline int iwl_trans_resume(struct iwl_trans *trans)

{

	return trans->ops->resume(trans);

}

#endif



static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val)

{

	trans->ops->write8(trans, ofs, val);

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

+12 −6
Original line number Diff line number Diff line
@@ -367,21 +367,19 @@ static void iwl_pci_remove(struct pci_dev *pdev) 


static int iwl_pci_suspend(struct device *device)

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct iwl_trans *iwl_trans = pci_get_drvdata(pdev);



	/* Before you put code here, think about WoWLAN. You cannot check here

	 * whether WoWLAN is enabled or not, and your code will run even if

	 * WoWLAN is enabled - don't kill the NIC, someone may need it in Sx.

	 */



	return iwl_trans_suspend(iwl_trans);

	return 0;

}



static int iwl_pci_resume(struct device *device)

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct iwl_trans *iwl_trans = pci_get_drvdata(pdev);

	struct iwl_trans *trans = pci_get_drvdata(pdev);

	bool hw_rfkill;



	/* Before you put code here, think about WoWLAN. You cannot check here

	 * whether WoWLAN is enabled or not, and your code will run even if
@@ -394,7 +392,15 @@ static int iwl_pci_resume(struct device *device) 
	 */

	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);



	return iwl_trans_resume(iwl_trans);

	if (!trans->op_mode)

		return 0;



	iwl_enable_rfkill_int(trans);



	hw_rfkill = iwl_is_rfkill_set(trans);

	iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);



	return 0;

}



static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);

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

+0 −26
Original line number Diff line number Diff line
@@ -815,28 +815,6 @@ static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state) 
		clear_bit(STATUS_TPOWER_PMI, &trans_pcie->status);

}



#ifdef CONFIG_PM_SLEEP

static int iwl_trans_pcie_suspend(struct iwl_trans *trans)

{

	return 0;

}



static int iwl_trans_pcie_resume(struct iwl_trans *trans)

{

	bool hw_rfkill;



	if (!trans->op_mode)

		return 0;



	iwl_enable_rfkill_int(trans);



	hw_rfkill = iwl_is_rfkill_set(trans);

	iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);



	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent,

						unsigned long *flags)

{
@@ -1378,10 +1356,6 @@ static const struct iwl_trans_ops trans_ops_pcie = { 


	.wait_tx_queue_empty = iwl_trans_pcie_wait_txq_empty,



#ifdef CONFIG_PM_SLEEP

	.suspend = iwl_trans_pcie_suspend,

	.resume = iwl_trans_pcie_resume,

#endif

	.write8 = iwl_trans_pcie_write8,

	.write32 = iwl_trans_pcie_write32,

	.read32 = iwl_trans_pcie_read32,