iwlegacy: collapse wrapper for pcie_capability_read_word()

il_pcie_link_ctl() has only one call site and no longer provides any useful
abstraction, so collapse it into the caller.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 318ed3c9fe7499899d08fc3de1de917438690109..181150760461a6968ffcafa4e4a65ac4f5eecffc 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1183,8 +1183,9 @@ EXPORT_SYMBOL(il_power_update_mode);
 void
 il_power_initialize(struct il_priv *il)
 {
-       u16 lctl = il_pcie_link_ctl(il);
+       u16 lctl;
 
+       pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl);
        il->power_data.pci_pm = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN);
 
        il->power_data.debug_sleep_level_override = -1;
@@ -4233,7 +4234,7 @@ il_apm_init(struct il_priv *il)
         *    power savings, even without L1.
         */
        if (il->cfg->set_l0s) {
-               lctl = il_pcie_link_ctl(il);
+               pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &lctl);
                if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) ==
                    PCI_CFG_LINK_CTRL_VAL_L1_EN) {
                        /* L1-ASPM enabled; disable(!) L0S  */

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index b4bb813362bdbeb44afab3dd7b73d74dd556feb3..c9a5022aaa36cc9185f91e56cd491c264efa7520 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1829,14 +1829,6 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd);
  * PCI                                              *
  *****************************************************/
 
-static inline u16
-il_pcie_link_ctl(struct il_priv *il)
-{
-       u16 pci_lnk_ctl;
-       pcie_capability_read_word(il->pci_dev, PCI_EXP_LNKCTL, &pci_lnk_ctl);
-       return pci_lnk_ctl;
-}
-
 void il_bg_watchdog(unsigned long data);
 u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval);
 __le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,