Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation warning with 64 bit system #421

Closed
wants to merge 1 commit into from
Closed

Fix compilation warning with 64 bit system #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions debugfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,16 @@ static ssize_t mwl_debugfs_info_read(struct file *file, char __user *ubuf,
len += scnprintf(p + len, size - len,
"-----------------------=> address| address|qlen|fw_desc_cnt\n");
spin_lock_irqsave(&pcie_priv->tx_desc_lock, flags);
len += scnprintf(p + len, size - len,
"wcb_base0 : %x => %8x|%8p|%4d|%d\n", get_hw_spec->wcb_base0, *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),skb_queue_len(&pcie_priv->txq[0]),pcie_priv->fw_desc_cnt[0]);
len += scnprintf(p + len, size - len, "wcb_base0 : %x => %8x|%8p|%4u|%d\n",
get_hw_spec->wcb_base0, le32_to_cpu(get_hw_spec->wcb_base0),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you were just trying to fix the "int to pointer cast" warning, but you also changed how this function works.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically. Any suggestions?

&get_hw_spec->wcb_base0, skb_queue_len(&pcie_priv->txq[0]),
pcie_priv->fw_desc_cnt[0]);
for(i = 0; i < SYSADPT_TOTAL_TX_QUEUES - 1; i++)
len += scnprintf(p + len, size - len,
"wcb_base[%2d]: %x => %8x|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
len += scnprintf(
p + len, size - len, "wcb_base[%2d]: %x => %8x|%8p|%4u|%d\n", i,
get_hw_spec->wcb_base[i], le32_to_cpu(get_hw_spec->wcb_base[i]),
&get_hw_spec->wcb_base[i], skb_queue_len(&pcie_priv->txq[i + 1]),
pcie_priv->fw_desc_cnt[i + 1]);
spin_unlock_irqrestore(&pcie_priv->tx_desc_lock, flags);
}

Expand Down Expand Up @@ -1341,10 +1346,8 @@ static ssize_t mwl_debugfs_regrdwr_read(struct file *file, char __user *ubuf,
priv->reg_type, priv->reg_offset,
priv->reg_value);
else
len += scnprintf(p + len, size - len,
"error: %d(%u 0x%08x 0x%08x)\n",
ret, priv->reg_type, priv->reg_offset,
priv->reg_value);
len += scnprintf(p + len, size - len, "error: %zd(%u 0x%08x 0x%08x)\n", ret,
priv->reg_type, priv->reg_offset, priv->reg_value);

ret = simple_read_from_buffer(ubuf, count, ppos, p, len);

Expand Down
8 changes: 2 additions & 6 deletions hif/fwcmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2624,7 +2624,7 @@ int mwl_fwcmd_encryption_set_key(struct ieee80211_hw *hw,
return -ENOTSUPP;
}

memcpy((void *)&pcmd->key_param.key, key->key, keymlen);
memcpy(&pcmd->key_param.key, key->key, keymlen);
pcmd->action_type = cpu_to_le32(action);

if (mwl_hif_exec_cmd(hw, HOSTCMD_CMD_UPDATE_ENCRYPTION)) {
Expand Down Expand Up @@ -3622,11 +3622,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ieee80211_hw *hw,
core_dump->context = pcmd->cmd_data.coredump.context;
core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
core_dump->flags = pcmd->cmd_data.coredump.flags;
memcpy(buff,
(const void *)((u32)pcmd +
sizeof(struct hostcmd_cmd_get_fw_core_dump) -
sizeof(struct hostcmd_cmd_get_fw_core_dump_)),
MAX_CORE_DUMP_BUFFER);
memcpy(buff, pcmd->buffer, MAX_CORE_DUMP_BUFFER);

mutex_unlock(&priv->fwcmd_mutex);

Expand Down
5 changes: 2 additions & 3 deletions hif/pcie/8964/tx_ndp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,8 @@ int pcie_tx_init_ndp(struct ieee80211_hw *hw)

if (sizeof(struct pcie_tx_ctrl_ndp) >
sizeof(tx_info->driver_data)) {
wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
sizeof(struct pcie_tx_ctrl_ndp),
sizeof(tx_info->driver_data));
wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
sizeof(struct pcie_tx_ctrl_ndp), sizeof(tx_info->driver_data));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sizeof checks can be done at compile time BUILD_BUG_ON

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I follow

return -ENOMEM;
}

Expand Down
3 changes: 1 addition & 2 deletions hif/pcie/pcie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,8 +1466,7 @@ static void pcie_bf_mimo_ctrl_decode(struct mwl_priv *priv,
&fp_data->f_pos);
filp_close(fp_data, current->files);
} else {
wiphy_err(priv->hw->wiphy, "Error opening %s! %x\n",
filename, (unsigned int)fp_data);
wiphy_err(priv->hw->wiphy, "Error opening %s! %ld\n", filename, PTR_ERR(fp_data));
}

#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
Expand Down