Skip to content

Commit

Permalink
drivers/s390/net: Drop memory allocation cast
Browse files Browse the repository at this point in the history
Drop cast on the result of kmalloc and similar functions.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
@@

- (T *)
  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed May 18, 2010
1 parent 95718c1 commit ae57b20
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
6 changes: 2 additions & 4 deletions drivers/s390/net/ctcm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1364,8 +1364,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,

ch->protocol = priv->protocol;
if (IS_MPC(priv)) {
ch->discontact_th = (struct th_header *)
kzalloc(TH_HEADER_LENGTH, gfp_type());
ch->discontact_th = kzalloc(TH_HEADER_LENGTH, gfp_type());
if (ch->discontact_th == NULL)
goto nomem_return;

Expand All @@ -1379,8 +1378,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
} else
ccw_num = 8;

ch->ccw = (struct ccw1 *)
kzalloc(ccw_num * sizeof(struct ccw1), GFP_KERNEL | GFP_DMA);
ch->ccw = kzalloc(ccw_num * sizeof(struct ccw1), GFP_KERNEL | GFP_DMA);
if (ch->ccw == NULL)
goto nomem_return;

Expand Down
6 changes: 2 additions & 4 deletions drivers/s390/net/ctcm_mpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,7 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)
goto done;
}

header = (struct th_sweep *)
kmalloc(sizeof(struct th_sweep), gfp_type());
header = kmalloc(sizeof(struct th_sweep), gfp_type());

if (!header) {
dev_kfree_skb_any(sweep_skb);
Expand Down Expand Up @@ -1191,8 +1190,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
skb_pull(pskb, new_len); /* point to next PDU */
}
} else {
mpcginfo = (struct mpcg_info *)
kmalloc(sizeof(struct mpcg_info), gfp_type());
mpcginfo = kmalloc(sizeof(struct mpcg_info), gfp_type());
if (mpcginfo == NULL)
goto done;

Expand Down
3 changes: 1 addition & 2 deletions drivers/s390/net/lcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1238,8 +1238,7 @@ lcs_set_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
ipm = lcs_check_addr_entry(card, im4, buf);
if (ipm != NULL)
continue; /* Address already in list. */
ipm = (struct lcs_ipm_list *)
kzalloc(sizeof(struct lcs_ipm_list), GFP_ATOMIC);
ipm = kzalloc(sizeof(struct lcs_ipm_list), GFP_ATOMIC);
if (ipm == NULL) {
pr_info("Not enough memory to add"
" new multicast entry!\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/net/qeth_core_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ static int qeth_setup_channel(struct qeth_channel *channel)

QETH_DBF_TEXT(SETUP, 2, "setupch");
for (cnt = 0; cnt < QETH_CMD_BUFFER_NO; cnt++) {
channel->iob[cnt].data = (char *)
channel->iob[cnt].data =
kmalloc(QETH_BUFSIZE, GFP_DMA|GFP_KERNEL);
if (channel->iob[cnt].data == NULL)
break;
Expand Down

0 comments on commit ae57b20

Please sign in to comment.