4 files changed, 6 insertions, 11 deletions

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index e35713dd0504..4ecafbf91211 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -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;
 
@@ -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;
 
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 5978b390153f..87c24d2936d6 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -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);
@@ -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;
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 9b19ea13b4d8..0f19d540b655 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -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");
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index fd1f48c771fc..e862c2d8e5c0 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -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;