[PATCH 2/4] staging: rdma: use kmalloc_array instead of kmalloc

[Geliang Tang]

Use kmalloc_array instead of kmalloc to allocate memory for an array.

Signed-off-by: Geliang Tang 
---
 drivers/staging/rdma/amso1100/c2.c  | 6 --
 drivers/staging/rdma/ipath/ipath_file_ops.c | 8 
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rdma/amso1100/c2.c 
b/drivers/staging/rdma/amso1100/c2.c
index 35ac536..4e6d24a 100644
--- a/drivers/staging/rdma/amso1100/c2.c
+++ b/drivers/staging/rdma/amso1100/c2.c
@@ -116,7 +116,8 @@ static int c2_tx_ring_alloc(struct c2_ring *tx_ring, void 
*vaddr,
struct c2_element *elem;
int i;
 
-   tx_ring->start = kmalloc(sizeof(*elem) * tx_ring->count, GFP_KERNEL);
+   tx_ring->start = kmalloc_array(tx_ring->count, sizeof(*elem),
+  GFP_KERNEL);
if (!tx_ring->start)
return -ENOMEM;
 
@@ -165,7 +166,8 @@ static int c2_rx_ring_alloc(struct c2_ring *rx_ring, void 
*vaddr,
struct c2_element *elem;
int i;
 
-   rx_ring->start = kmalloc(sizeof(*elem) * rx_ring->count, GFP_KERNEL);
+   rx_ring->start = kmalloc_array(rx_ring->count, sizeof(*elem),
+  GFP_KERNEL);
if (!rx_ring->start)
return -ENOMEM;
 
diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c 
b/drivers/staging/rdma/ipath/ipath_file_ops.c
index 13c3cd1..6187b84 100644
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -917,15 +917,15 @@ static int ipath_create_user_egr(struct ipath_portdata 
*pd)
chunk = pd->port_rcvegrbuf_chunks;
egrperchunk = pd->port_rcvegrbufs_perchunk;
size = pd->port_rcvegrbuf_size;
-   pd->port_rcvegrbuf = kmalloc(chunk * sizeof(pd->port_rcvegrbuf[0]),
-GFP_KERNEL);
+   pd->port_rcvegrbuf = kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf[0]),
+  GFP_KERNEL);
if (!pd->port_rcvegrbuf) {
ret = -ENOMEM;
goto bail;
}
pd->port_rcvegrbuf_phys =
-   kmalloc(chunk * sizeof(pd->port_rcvegrbuf_phys[0]),
-   GFP_KERNEL);
+   kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf_phys[0]),
+ GFP_KERNEL);
if (!pd->port_rcvegrbuf_phys) {
ret = -ENOMEM;
goto bail_rcvegrbuf;
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/4] staging: rdma: use kmalloc_array instead of kmalloc

[Geliang Tang]

Use kmalloc_array instead of kmalloc to allocate memory for an array.

Signed-off-by: Geliang Tang 
---
 drivers/staging/rdma/amso1100/c2.c  | 6 --
 drivers/staging/rdma/ipath/ipath_file_ops.c | 8 
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rdma/amso1100/c2.c 
b/drivers/staging/rdma/amso1100/c2.c
index 35ac536..4e6d24a 100644
--- a/drivers/staging/rdma/amso1100/c2.c
+++ b/drivers/staging/rdma/amso1100/c2.c
@@ -116,7 +116,8 @@ static int c2_tx_ring_alloc(struct c2_ring *tx_ring, void 
*vaddr,
struct c2_element *elem;
int i;
 
-   tx_ring->start = kmalloc(sizeof(*elem) * tx_ring->count, GFP_KERNEL);
+   tx_ring->start = kmalloc_array(tx_ring->count, sizeof(*elem),
+  GFP_KERNEL);
if (!tx_ring->start)
return -ENOMEM;
 
@@ -165,7 +166,8 @@ static int c2_rx_ring_alloc(struct c2_ring *rx_ring, void 
*vaddr,
struct c2_element *elem;
int i;
 
-   rx_ring->start = kmalloc(sizeof(*elem) * rx_ring->count, GFP_KERNEL);
+   rx_ring->start = kmalloc_array(rx_ring->count, sizeof(*elem),
+  GFP_KERNEL);
if (!rx_ring->start)
return -ENOMEM;
 
diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c 
b/drivers/staging/rdma/ipath/ipath_file_ops.c
index 13c3cd1..6187b84 100644
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -917,15 +917,15 @@ static int ipath_create_user_egr(struct ipath_portdata 
*pd)
chunk = pd->port_rcvegrbuf_chunks;
egrperchunk = pd->port_rcvegrbufs_perchunk;
size = pd->port_rcvegrbuf_size;
-   pd->port_rcvegrbuf = kmalloc(chunk * sizeof(pd->port_rcvegrbuf[0]),
-GFP_KERNEL);
+   pd->port_rcvegrbuf = kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf[0]),
+  GFP_KERNEL);
if (!pd->port_rcvegrbuf) {
ret = -ENOMEM;
goto bail;
}
pd->port_rcvegrbuf_phys =
-   kmalloc(chunk * sizeof(pd->port_rcvegrbuf_phys[0]),
-   GFP_KERNEL);
+   kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf_phys[0]),
+ GFP_KERNEL);
if (!pd->port_rcvegrbuf_phys) {
ret = -ENOMEM;
goto bail_rcvegrbuf;
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/