From e821b5070cc38e642b3a0daa88d133ec0cb63493 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Mon, 26 Oct 2015 12:39:04 +0100 Subject: mwlwifi: remove awkward boolean back-n-forth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork --- debugfs.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/debugfs.c b/debugfs.c index 4181483..4f2b877 100644 --- a/debugfs.c +++ b/debugfs.c @@ -258,15 +258,12 @@ static ssize_t mwl_debugfs_ampdu_read(struct file *file, char __user *ubuf, static int mwl_debugfs_reg_access(struct mwl_priv *priv, bool write) { struct ieee80211_hw *hw = priv->hw; - u8 set; u32 *addr_val; int ret = 0; - set = write ? WL_SET : WL_GET; - switch (priv->reg_type) { case MWL_ACCESS_MAC: - if (set == WL_GET) + if (!write) priv->reg_value = le32_to_cpu(MAC_REG_ADDR_PCI(priv->reg_offset)); else @@ -274,19 +271,19 @@ static int mwl_debugfs_reg_access(struct mwl_priv *priv, bool write) MAC_REG_ADDR_PCI(priv->reg_offset)); break; case MWL_ACCESS_RF: - ret = mwl_fwcmd_reg_rf(hw, set, priv->reg_offset, - &priv->reg_value); + ret = mwl_fwcmd_reg_rf(hw, write ? WL_SET : WL_GET, + priv->reg_offset, &priv->reg_value); break; case MWL_ACCESS_BBP: - ret = mwl_fwcmd_reg_bb(hw, set, priv->reg_offset, - &priv->reg_value); + ret = mwl_fwcmd_reg_bb(hw, write ? WL_SET : WL_GET, + priv->reg_offset, &priv->reg_value); break; case MWL_ACCESS_CAU: - ret = mwl_fwcmd_reg_cau(hw, set, priv->reg_offset, - &priv->reg_value); + ret = mwl_fwcmd_reg_cau(hw, write ? WL_SET : WL_GET, + priv->reg_offset, &priv->reg_value); break; case MWL_ACCESS_ADDR0: - if (set == WL_GET) + if (!write) priv->reg_value = readl(priv->iobase0 + priv->reg_offset); else @@ -294,7 +291,7 @@ static int mwl_debugfs_reg_access(struct mwl_priv *priv, bool write) priv->iobase0 + priv->reg_offset); break; case MWL_ACCESS_ADDR1: - if (set == WL_GET) + if (!write) priv->reg_value = readl(priv->iobase1 + priv->reg_offset); else @@ -307,8 +304,9 @@ static int mwl_debugfs_reg_access(struct mwl_priv *priv, bool write) memset(addr_val, 0, 64 * sizeof(u32)); addr_val[0] = priv->reg_value; ret = mwl_fwcmd_get_addr_value(hw, priv->reg_offset, - 4, addr_val, set); - if ((!ret) && (set == WL_GET)) + 4, addr_val, + write ? WL_SET : WL_GET); + if (!ret && !write) priv->reg_value = addr_val[0]; kfree(addr_val); } else -- cgit v1.2.3