Skip to content

Commit

Permalink
net: ena: store values in their appropriate variables types
Browse files Browse the repository at this point in the history
This patch changes some of the variables types to match the values they
hold. These wrong types fail some of our static checkers that search for
accidental conversions in our driver.

Signed-off-by: Ido Segev <idose@amazon.com>
Signed-off-by: Igor Chauskin <igorch@amazon.com>
Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Shay Agroskin authored and Jakub Kicinski committed Dec 9, 2020
1 parent da580ca commit e9548fd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions drivers/net/ethernet/amazon/ena/ena_com.c
Original file line number Diff line number Diff line change
Expand Up @@ -1360,16 +1360,15 @@ int ena_com_execute_admin_command(struct ena_com_admin_queue *admin_queue,
comp_ctx = ena_com_submit_admin_cmd(admin_queue, cmd, cmd_size,
comp, comp_size);
if (IS_ERR(comp_ctx)) {
if (comp_ctx == ERR_PTR(-ENODEV))
ret = PTR_ERR(comp_ctx);
if (ret == -ENODEV)
netdev_dbg(admin_queue->ena_dev->net_device,
"Failed to submit command [%ld]\n",
PTR_ERR(comp_ctx));
"Failed to submit command [%d]\n", ret);
else
netdev_err(admin_queue->ena_dev->net_device,
"Failed to submit command [%ld]\n",
PTR_ERR(comp_ctx));
"Failed to submit command [%d]\n", ret);

return PTR_ERR(comp_ctx);
return ret;
}

ret = ena_com_wait_and_process_admin_cq(comp_ctx, admin_queue);
Expand Down Expand Up @@ -1595,7 +1594,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)
int ena_com_get_dma_width(struct ena_com_dev *ena_dev)
{
u32 caps = ena_com_reg_bar_read32(ena_dev, ENA_REGS_CAPS_OFF);
int width;
u32 width;

if (unlikely(caps == ENA_MMIO_READ_TIMEOUT)) {
netdev_err(ena_dev->net_device, "Reg read timeout occurred\n");
Expand Down Expand Up @@ -2247,7 +2246,7 @@ int ena_com_get_dev_basic_stats(struct ena_com_dev *ena_dev,
return ret;
}

int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)
int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)
{
struct ena_com_admin_queue *admin_queue;
struct ena_admin_set_feat_cmd cmd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/amazon/ena/ena_com.h
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ int ena_com_get_eni_stats(struct ena_com_dev *ena_dev,
*
* @return: 0 on Success and negative value otherwise.
*/
int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu);
int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu);

/* ena_com_get_offload_settings - Retrieve the device offloads capabilities
* @ena_dev: ENA communication layer struct
Expand Down

0 comments on commit e9548fd

Please sign in to comment.