leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mlx4: sizeof style usage

Browse Source 
The kernel coding style is to treat sizeof as a function
(ie. with parenthesis) not as an operator.

Also use kcalloc and kmalloc_array

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2017-08-15 10:29:19 -07:00 committed by David S. Miller
parent 9d2ee98daf
commit 31975e27a4
15 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlx4/alloc.c
View File

@ -186,7 +186,7 @@ int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
bitmap->effective_len = bitmap->avail; bitmap->effective_len = bitmap->avail;
spin_lock_init(&bitmap->lock); spin_lock_init(&bitmap->lock);
bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) * bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) *
sizeof (long), GFP_KERNEL); sizeof(long), GFP_KERNEL);
if (!bitmap->table) if (!bitmap->table)
return -ENOMEM; return -ENOMEM;

4
drivers/net/ethernet/mellanox/mlx4/cmd.c
View File

@ -2637,7 +2637,7 @@ int mlx4_cmd_use_events(struct mlx4_dev *dev)
int err = 0; int err = 0;
priv->cmd.context = kmalloc(priv->cmd.max_cmds * priv->cmd.context = kmalloc(priv->cmd.max_cmds *
sizeof (struct mlx4_cmd_context), sizeof(struct mlx4_cmd_context),
GFP_KERNEL); GFP_KERNEL);
if (!priv->cmd.context) if (!priv->cmd.context)
return -ENOMEM; return -ENOMEM;
@ -2695,7 +2695,7 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
{ {
struct mlx4_cmd_mailbox *mailbox; struct mlx4_cmd_mailbox *mailbox;
mailbox = kmalloc(sizeof *mailbox, GFP_KERNEL); mailbox = kmalloc(sizeof(*mailbox), GFP_KERNEL);
if (!mailbox) if (!mailbox)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

2
drivers/net/ethernet/mellanox/mlx4/en_resources.c
View File

@ -44,7 +44,7 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
struct mlx4_en_dev *mdev = priv->mdev; struct mlx4_en_dev *mdev = priv->mdev;
struct net_device *dev = priv->dev; struct net_device *dev = priv->dev;
memset(context, 0, sizeof *context); memset(context, 0, sizeof(*context));
context->flags = cpu_to_be32(7 << 16 | rss << MLX4_RSS_QPC_FLAG_OFFSET); context->flags = cpu_to_be32(7 << 16 | rss << MLX4_RSS_QPC_FLAG_OFFSET);
context->pd = cpu_to_be32(mdev->priv_pdn); context->pd = cpu_to_be32(mdev->priv_pdn);
context->mtu_msgmax = 0xff; context->mtu_msgmax = 0xff;

2
drivers/net/ethernet/mellanox/mlx4/en_rx.c
View File

@ -1056,7 +1056,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
} }
qp->event = mlx4_en_sqp_event; qp->event = mlx4_en_sqp_event;
memset(context, 0, sizeof *context); memset(context, 0, sizeof(*context));
mlx4_en_fill_qp_context(priv, ring->actual_size, ring->stride, 0, 0, mlx4_en_fill_qp_context(priv, ring->actual_size, ring->stride, 0, 0,
qpn, ring->cqn, -1, context); qpn, ring->cqn, -1, context);
context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma); context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma);

2
drivers/net/ethernet/mellanox/mlx4/en_tx.c
View File

@ -643,7 +643,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc,
void *fragptr) void *fragptr)
{ {
struct mlx4_wqe_inline_seg *inl = &tx_desc->inl; struct mlx4_wqe_inline_seg *inl = &tx_desc->inl;
int spc = MLX4_INLINE_ALIGN - CTRL_SIZE - sizeof *inl; int spc = MLX4_INLINE_ALIGN - CTRL_SIZE - sizeof(*inl);
unsigned int hlen = skb_headlen(skb); unsigned int hlen = skb_headlen(skb);
if (skb->len <= spc) { if (skb->len <= spc) {

20
drivers/net/ethernet/mellanox/mlx4/eq.c
View File

@ -259,7 +259,7 @@ int mlx4_gen_pkey_eqe(struct mlx4_dev *dev, int slave, u8 port)
if (!s_slave->active) if (!s_slave->active)
return 0; return 0;
memset(&eqe, 0, sizeof eqe); memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT; eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE; eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE;
@ -276,7 +276,7 @@ int mlx4_gen_guid_change_eqe(struct mlx4_dev *dev, int slave, u8 port)
/*don't send if we don't have the that slave */ /*don't send if we don't have the that slave */
if (dev->persist->num_vfs < slave) if (dev->persist->num_vfs < slave)
return 0; return 0;
memset(&eqe, 0, sizeof eqe); memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT; eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_GUID_INFO; eqe.subtype = MLX4_DEV_PMC_SUBTYPE_GUID_INFO;
@ -295,7 +295,7 @@ int mlx4_gen_port_state_change_eqe(struct mlx4_dev *dev, int slave, u8 port,
/*don't send if we don't have the that slave */ /*don't send if we don't have the that slave */
if (dev->persist->num_vfs < slave) if (dev->persist->num_vfs < slave)
return 0; return 0;
memset(&eqe, 0, sizeof eqe); memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_CHANGE; eqe.type = MLX4_EVENT_TYPE_PORT_CHANGE;
eqe.subtype = port_subtype_change; eqe.subtype = port_subtype_change;
@ -432,7 +432,7 @@ int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr)
{ {
struct mlx4_eqe eqe; struct mlx4_eqe eqe;
memset(&eqe, 0, sizeof eqe); memset(&eqe, 0, sizeof(eqe));
eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT; eqe.type = MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT;
eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PORT_INFO; eqe.subtype = MLX4_DEV_PMC_SUBTYPE_PORT_INFO;
@ -726,7 +726,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
} }
memcpy(&priv->mfunc.master.comm_arm_bit_vector, memcpy(&priv->mfunc.master.comm_arm_bit_vector,
eqe->event.comm_channel_arm.bit_vec, eqe->event.comm_channel_arm.bit_vec,
sizeof eqe->event.comm_channel_arm.bit_vec); sizeof(eqe)->event.comm_channel_arm.bit_vec);
queue_work(priv->mfunc.master.comm_wq, queue_work(priv->mfunc.master.comm_wq,
&priv->mfunc.master.comm_work); &priv->mfunc.master.comm_work);
break; break;
@ -984,15 +984,15 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
*/ */
npages = PAGE_ALIGN(eq->nent * dev->caps.eqe_size) / PAGE_SIZE; npages = PAGE_ALIGN(eq->nent * dev->caps.eqe_size) / PAGE_SIZE;
eq->page_list = kmalloc(npages * sizeof *eq->page_list, eq->page_list = kmalloc_array(npages, sizeof(*eq->page_list),
GFP_KERNEL); GFP_KERNEL);
if (!eq->page_list) if (!eq->page_list)
goto err_out; goto err_out;
for (i = 0; i < npages; ++i) for (i = 0; i < npages; ++i)
eq->page_list[i].buf = NULL; eq->page_list[i].buf = NULL;
dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL); dma_list = kmalloc_array(npages, sizeof(*dma_list), GFP_KERNEL);
if (!dma_list) if (!dma_list)
goto err_out_free; goto err_out_free;
@ -1161,7 +1161,7 @@ int mlx4_alloc_eq_table(struct mlx4_dev *dev)
struct mlx4_priv *priv = mlx4_priv(dev); struct mlx4_priv *priv = mlx4_priv(dev);
priv->eq_table.eq = kcalloc(dev->caps.num_eqs - dev->caps.reserved_eqs, priv->eq_table.eq = kcalloc(dev->caps.num_eqs - dev->caps.reserved_eqs,
sizeof *priv->eq_table.eq, GFP_KERNEL); sizeof(*priv->eq_table.eq), GFP_KERNEL);
if (!priv->eq_table.eq) if (!priv->eq_table.eq)
return -ENOMEM; return -ENOMEM;
@ -1180,7 +1180,7 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
int i; int i;
priv->eq_table.uar_map = kcalloc(mlx4_num_eq_uar(dev), priv->eq_table.uar_map = kcalloc(mlx4_num_eq_uar(dev),
sizeof *priv->eq_table.uar_map, sizeof(*priv->eq_table.uar_map),
GFP_KERNEL); GFP_KERNEL);
if (!priv->eq_table.uar_map) { if (!priv->eq_table.uar_map) {
err = -ENOMEM; err = -ENOMEM;

2
drivers/net/ethernet/mellanox/mlx4/fw.c
View File

@ -57,7 +57,7 @@ MODULE_PARM_DESC(enable_qos, "Enable Enhanced QoS support (default: off)");
do { \ do { \
void *__p = (char *) (source) + (offset); \ void *__p = (char *) (source) + (offset); \
u64 val; \ u64 val; \
switch (sizeof (dest)) { \ switch (sizeof(dest)) { \
case 1: (dest) = *(u8 *) __p; break; \ case 1: (dest) = *(u8 *) __p; break; \
case 2: (dest) = be16_to_cpup(__p); break; \ case 2: (dest) = be16_to_cpup(__p); break; \
case 4: (dest) = be32_to_cpup(__p); break; \ case 4: (dest) = be32_to_cpup(__p); break; \

2
drivers/net/ethernet/mellanox/mlx4/icm.c
View File

@ -400,7 +400,7 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size; obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size;
num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk; num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk;
table->icm = kcalloc(num_icm, sizeof *table->icm, GFP_KERNEL); table->icm = kcalloc(num_icm, sizeof(*table->icm), GFP_KERNEL);
if (!table->icm) if (!table->icm)
return -ENOMEM; return -ENOMEM;
table->virt = virt; table->virt = virt;

4
drivers/net/ethernet/mellanox/mlx4/icm.h
View File

@ -39,8 +39,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#define MLX4_ICM_CHUNK_LEN \ #define MLX4_ICM_CHUNK_LEN \
((256 - sizeof (struct list_head) - 2 * sizeof (int)) / \ ((256 - sizeof(struct list_head) - 2 * sizeof(int)) / \
(sizeof (struct scatterlist))) (sizeof(struct scatterlist)))
enum { enum {
MLX4_ICM_PAGE_SHIFT = 12, MLX4_ICM_PAGE_SHIFT = 12,

2
drivers/net/ethernet/mellanox/mlx4/intf.c
View File

@ -53,7 +53,7 @@ static void mlx4_add_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
{ {
struct mlx4_device_context *dev_ctx; struct mlx4_device_context *dev_ctx;
dev_ctx = kmalloc(sizeof *dev_ctx, GFP_KERNEL); dev_ctx = kmalloc(sizeof(*dev_ctx), GFP_KERNEL);
if (!dev_ctx) if (!dev_ctx)
return; return;

12
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -925,10 +925,10 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
mlx4_replace_zero_macs(dev); mlx4_replace_zero_macs(dev);
dev->caps.qp0_qkey = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL); dev->caps.qp0_qkey = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
if (!dev->caps.qp0_tunnel || !dev->caps.qp0_proxy || if (!dev->caps.qp0_tunnel || !dev->caps.qp0_proxy ||
!dev->caps.qp1_tunnel || !dev->caps.qp1_proxy || !dev->caps.qp1_tunnel || !dev->caps.qp1_proxy ||
@ -2399,7 +2399,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
dev->caps.rx_checksum_flags_port[2] = params.rx_csum_flags_port_2; dev->caps.rx_checksum_flags_port[2] = params.rx_csum_flags_port_2;
} }
priv->eq_table.inta_pin = adapter.inta_pin; priv->eq_table.inta_pin = adapter.inta_pin;
memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id); memcpy(dev->board_id, adapter.board_id, sizeof(dev->board_id));
return 0; return 0;
@ -2869,7 +2869,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
dev->caps.num_eqs - dev->caps.reserved_eqs, dev->caps.num_eqs - dev->caps.reserved_eqs,
MAX_MSIX); MAX_MSIX);
entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); entries = kcalloc(nreq, sizeof(*entries), GFP_KERNEL);
if (!entries) if (!entries)
goto no_msi; goto no_msi;

12
drivers/net/ethernet/mellanox/mlx4/mcg.c
View File

@ -162,7 +162,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
return -EINVAL; return -EINVAL;
s_steer = &mlx4_priv(dev)->steer[port - 1]; s_steer = &mlx4_priv(dev)->steer[port - 1];
new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL); new_entry = kzalloc(sizeof(*new_entry), GFP_KERNEL);
if (!new_entry) if (!new_entry)
return -ENOMEM; return -ENOMEM;
@ -175,7 +175,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
*/ */
pqp = get_promisc_qp(dev, port, steer, qpn); pqp = get_promisc_qp(dev, port, steer, qpn);
if (pqp) { if (pqp) {
dqp = kmalloc(sizeof *dqp, GFP_KERNEL); dqp = kmalloc(sizeof(*dqp), GFP_KERNEL);
if (!dqp) { if (!dqp) {
err = -ENOMEM; err = -ENOMEM;
goto out_alloc; goto out_alloc;
@ -274,7 +274,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
} }
/* add the qp as a duplicate on this index */ /* add the qp as a duplicate on this index */
dqp = kmalloc(sizeof *dqp, GFP_KERNEL); dqp = kmalloc(sizeof(*dqp), GFP_KERNEL);
if (!dqp) if (!dqp)
return -ENOMEM; return -ENOMEM;
dqp->qpn = qpn; dqp->qpn = qpn;
@ -443,7 +443,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
goto out_mutex; goto out_mutex;
} }
pqp = kmalloc(sizeof *pqp, GFP_KERNEL); pqp = kmalloc(sizeof(*pqp), GFP_KERNEL);
if (!pqp) { if (!pqp) {
err = -ENOMEM; err = -ENOMEM;
goto out_mutex; goto out_mutex;
@ -514,7 +514,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
/* add the new qpn to list of promisc qps */ /* add the new qpn to list of promisc qps */
list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]); list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]);
/* now need to add all the promisc qps to default entry */ /* now need to add all the promisc qps to default entry */
memset(mgm, 0, sizeof *mgm); memset(mgm, 0, sizeof(*mgm));
members_count = 0; members_count = 0;
list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list) { list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list) {
if (members_count == dev->caps.num_qp_per_mgm) { if (members_count == dev->caps.num_qp_per_mgm) {
@ -1144,7 +1144,7 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
index += dev->caps.num_mgms; index += dev->caps.num_mgms;
new_entry = 1; new_entry = 1;
memset(mgm, 0, sizeof *mgm); memset(mgm, 0, sizeof(*mgm));
memcpy(mgm->gid, gid, 16); memcpy(mgm->gid, gid, 16);
} }

10
drivers/net/ethernet/mellanox/mlx4/mr.c
View File

@ -106,9 +106,9 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
buddy->max_order = max_order; buddy->max_order = max_order;
spin_lock_init(&buddy->lock); spin_lock_init(&buddy->lock);
buddy->bits = kcalloc(buddy->max_order + 1, sizeof (long *), buddy->bits = kcalloc(buddy->max_order + 1, sizeof(long *),
GFP_KERNEL); GFP_KERNEL);
buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free, buddy->num_free = kcalloc(buddy->max_order + 1, sizeof(*buddy->num_free),
GFP_KERNEL); GFP_KERNEL);
if (!buddy->bits || !buddy->num_free) if (!buddy->bits || !buddy->num_free)
goto err_out; goto err_out;
@ -703,13 +703,13 @@ static int mlx4_write_mtt_chunk(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
return -ENOMEM; return -ENOMEM;
dma_sync_single_for_cpu(&dev->persist->pdev->dev, dma_handle, dma_sync_single_for_cpu(&dev->persist->pdev->dev, dma_handle,
npages * sizeof (u64), DMA_TO_DEVICE); npages * sizeof(u64), DMA_TO_DEVICE);
for (i = 0; i < npages; ++i) for (i = 0; i < npages; ++i)
mtts[i] = cpu_to_be64(page_list[i] | MLX4_MTT_FLAG_PRESENT); mtts[i] = cpu_to_be64(page_list[i] | MLX4_MTT_FLAG_PRESENT);
dma_sync_single_for_device(&dev->persist->pdev->dev, dma_handle, dma_sync_single_for_device(&dev->persist->pdev->dev, dma_handle,
npages * sizeof (u64), DMA_TO_DEVICE); npages * sizeof(u64), DMA_TO_DEVICE);
return 0; return 0;
} }
@ -1052,7 +1052,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
return -EINVAL; return -EINVAL;
/* All MTTs must fit in the same page */ /* All MTTs must fit in the same page */
if (max_pages * sizeof *fmr->mtts > PAGE_SIZE) if (max_pages * sizeof(*fmr->mtts) > PAGE_SIZE)
return -EINVAL; return -EINVAL;
fmr->page_shift = page_shift; fmr->page_shift = page_shift;

12
drivers/net/ethernet/mellanox/mlx4/qp.c
View File

@ -174,7 +174,7 @@ static int __mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
cpu_to_be16(mlx4_qp_roce_entropy(dev, qp->qpn)); cpu_to_be16(mlx4_qp_roce_entropy(dev, qp->qpn));
*(__be32 *) mailbox->buf = cpu_to_be32(optpar); *(__be32 *) mailbox->buf = cpu_to_be32(optpar);
memcpy(mailbox->buf + 8, context, sizeof *context); memcpy(mailbox->buf + 8, context, sizeof(*context));
((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn = ((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn =
cpu_to_be32(qp->qpn); cpu_to_be32(qp->qpn);
@ -844,10 +844,10 @@ int mlx4_init_qp_table(struct mlx4_dev *dev)
/* In mfunc, calculate proxy and tunnel qp offsets for the PF here, /* In mfunc, calculate proxy and tunnel qp offsets for the PF here,
* since the PF does not call mlx4_slave_caps */ * since the PF does not call mlx4_slave_caps */
dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL); dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
if (!dev->caps.qp0_tunnel || !dev->caps.qp0_proxy || if (!dev->caps.qp0_tunnel || !dev->caps.qp0_proxy ||
!dev->caps.qp1_tunnel || !dev->caps.qp1_proxy) { !dev->caps.qp1_tunnel || !dev->caps.qp1_proxy) {
@ -907,7 +907,7 @@ int mlx4_qp_query(struct mlx4_dev *dev, struct mlx4_qp *qp,
MLX4_CMD_QUERY_QP, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_QUERY_QP, MLX4_CMD_TIME_CLASS_A,
MLX4_CMD_WRAPPED); MLX4_CMD_WRAPPED);
if (!err) if (!err)
memcpy(context, mailbox->buf + 8, sizeof *context); memcpy(context, mailbox->buf + 8, sizeof(*context));
mlx4_free_cmd_mailbox(dev, mailbox); mlx4_free_cmd_mailbox(dev, mailbox);
return err; return err;

24
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
View File

@ -1040,7 +1040,7 @@ static struct res_common *alloc_qp_tr(int id)
{ {
struct res_qp *ret; struct res_qp *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1058,7 +1058,7 @@ static struct res_common *alloc_mtt_tr(int id, int order)
{ {
struct res_mtt *ret; struct res_mtt *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1074,7 +1074,7 @@ static struct res_common *alloc_mpt_tr(int id, int key)
{ {
struct res_mpt *ret; struct res_mpt *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1089,7 +1089,7 @@ static struct res_common *alloc_eq_tr(int id)
{ {
struct res_eq *ret; struct res_eq *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1103,7 +1103,7 @@ static struct res_common *alloc_cq_tr(int id)
{ {
struct res_cq *ret; struct res_cq *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1118,7 +1118,7 @@ static struct res_common *alloc_srq_tr(int id)
{ {
struct res_srq *ret; struct res_srq *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1133,7 +1133,7 @@ static struct res_common *alloc_counter_tr(int id, int port)
{ {
struct res_counter *ret; struct res_counter *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1148,7 +1148,7 @@ static struct res_common *alloc_xrcdn_tr(int id)
{ {
struct res_xrcdn *ret; struct res_xrcdn *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1162,7 +1162,7 @@ static struct res_common *alloc_fs_rule_tr(u64 id, int qpn)
{ {
struct res_fs_rule *ret; struct res_fs_rule *ret;
ret = kzalloc(sizeof *ret, GFP_KERNEL); ret = kzalloc(sizeof(*ret), GFP_KERNEL);
if (!ret) if (!ret)
return NULL; return NULL;
@ -1274,7 +1274,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker; struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
struct rb_root *root = &tracker->res_tree[type]; struct rb_root *root = &tracker->res_tree[type];
res_arr = kzalloc(count * sizeof *res_arr, GFP_KERNEL); res_arr = kcalloc(count, sizeof(*res_arr), GFP_KERNEL);
if (!res_arr) if (!res_arr)
return -ENOMEM; return -ENOMEM;
@ -2027,7 +2027,7 @@ static int mac_add_to_slave(struct mlx4_dev *dev, int slave, u64 mac, int port,
if (mlx4_grant_resource(dev, slave, RES_MAC, 1, port)) if (mlx4_grant_resource(dev, slave, RES_MAC, 1, port))
return -EINVAL; return -EINVAL;
res = kzalloc(sizeof *res, GFP_KERNEL); res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res) { if (!res) {
mlx4_release_resource(dev, slave, RES_MAC, 1, port); mlx4_release_resource(dev, slave, RES_MAC, 1, port);
return -ENOMEM; return -ENOMEM;
@ -4020,7 +4020,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
struct res_gid *res; struct res_gid *res;
int err; int err;
res = kzalloc(sizeof *res, GFP_KERNEL); res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res) if (!res)
return -ENOMEM; return -ENOMEM;