22 files changed, 29 insertions, 29 deletions

diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index b98592a8bac8..f22e46dfd770 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -186,7 +186,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
  */
 static int ipddp_create(struct ipddp_route *new_rt)
 {
-        struct ipddp_route *rt =(struct ipddp_route*) kmalloc(sizeof(*rt), GFP_KERNEL);
+        struct ipddp_route *rt = kmalloc(sizeof(*rt), GFP_KERNEL);
 
         if (rt == NULL)
                 return -ENOMEM;
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index bae1de1e7802..7845eaf6f29f 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -395,7 +395,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
  * Allocate the main control structure for this instance.
  */
     maxmaxcode = MAXCODE(bits);
-    db         = (struct bsd_db *) kmalloc (sizeof (struct bsd_db),
+    db         = kmalloc(sizeof (struct bsd_db),
                                             GFP_KERNEL);
     if (!db)
       {
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 16620bd97fbf..11af0ae7510e 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1603,7 +1603,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
   irda_qos_bits_to_value (&self->qos);
 
   /* Allocate twice the size to guarantee alignment */
-  self->ringbuf = (void *) kmalloc (OBOE_RING_LEN << 1, GFP_KERNEL);
+  self->ringbuf = kmalloc(OBOE_RING_LEN << 1, GFP_KERNEL);
   if (!self->ringbuf)
     {
       printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6e95645e7245..3ca1082ec776 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1747,7 +1747,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         /* Don't change this buffer size and allocation without doing
          * some heavy and complete testing. Don't ask why :-(
          * Jean II */
-        self->speed_buff = (char *) kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
+        self->speed_buff = kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
         if (self->speed_buff == NULL) 
                 goto err_out_3;
 
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 654a68b490ae..3098960dc2a1 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -164,7 +164,7 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
         
         /* Allocate memory if needed */
         if (self->tx_buff.truesize > 0) {
-                self->tx_buff.head = (__u8 *) kmalloc(self->tx_buff.truesize, 
+                self->tx_buff.head = kmalloc(self->tx_buff.truesize,
                                                       GFP_KERNEL);
                 if (self->tx_buff.head == NULL) {
                         IRDA_ERROR("%s(), can't allocate memory for "
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index b833016f1825..177c502f7385 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -884,7 +884,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 
         dev->trans_start = jiffies;
 
-        tx_cmd = (struct tx_cmd *) kmalloc ((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC);
+        tx_cmd = kmalloc((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC);
         if (tx_cmd == NULL) {
                 printk(KERN_WARNING "%s: i596_xmit Memory squeeze, dropping packet.\n", dev->name);
                 lp->stats.tx_dropped++;
@@ -1266,7 +1266,7 @@ static void set_multicast_list(struct net_device *dev) {
         if (dev->mc_count > 0) {
                 struct dev_mc_list *dmi;
                 char *cp;
-                cmd = (struct i596_cmd *)kmalloc(sizeof(struct i596_cmd)+2+dev->mc_count*6, GFP_ATOMIC);
+                cmd = kmalloc(sizeof(struct i596_cmd)+2+dev->mc_count*6, GFP_ATOMIC);
                 if (cmd == NULL) {
                         printk (KERN_ERR "%s: set_multicast Memory squeeze.\n", dev->name);
                         return;
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index f54c55242f4a..72c8d6628f58 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -121,7 +121,7 @@ static void *z_comp_alloc(unsigned char *options, int opt_len)
         if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
                 return NULL;
 
-        state = (struct ppp_deflate_state *) kmalloc(sizeof(*state),
+        state = kmalloc(sizeof(*state),
                                                      GFP_KERNEL);
         if (state == NULL)
                 return NULL;
@@ -341,7 +341,7 @@ static void *z_decomp_alloc(unsigned char *options, int opt_len)
         if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
                 return NULL;
 
-        state = (struct ppp_deflate_state *) kmalloc(sizeof(*state), GFP_KERNEL);
+        state = kmalloc(sizeof(*state), GFP_KERNEL);
         if (state == NULL)
                 return NULL;
 
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index f3655fd772f5..d5bdd2574659 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -200,7 +200,7 @@ static void *mppe_alloc(unsigned char *options, int optlen)
             || options[0] != CI_MPPE || options[1] != CILEN_MPPE)
                 goto out;
 
-        state = (struct ppp_mppe_state *) kmalloc(sizeof(*state), GFP_KERNEL);
+        state = kmalloc(sizeof(*state), GFP_KERNEL);
         if (state == NULL)
                 goto out;
 
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 39c2152a07f4..a0806d262fc6 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -229,10 +229,10 @@ static int sl_realloc_bufs(struct slip *sl, int mtu)
         if (len < 576 * 2)
                 len = 576 * 2;
 
-        xbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-        rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        xbuff = kmalloc(len + 4, GFP_ATOMIC);
+        rbuff = kmalloc(len + 4, GFP_ATOMIC);
 #ifdef SL_INCLUDE_CSLIP
-        cbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        cbuff = kmalloc(len + 4, GFP_ATOMIC);
 #endif
 
 
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index a4f735723c41..a02c5fb40567 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -231,7 +231,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
                 return NULL;
         }
         
-        sv=(struct sv11_device *)kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
+        sv = kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
         if(!sv)
                 goto fail3;
                         
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 36d1c3ff7078..62184dee377c 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3455,7 +3455,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if ((err = pci_enable_device(pdev)) < 0)
                 return err;
 
-        card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
+        card = kmalloc(sizeof(pc300_t), GFP_KERNEL);
         if (card == NULL) {
                 printk("PC300 found at RAM 0x%016llx, "
                        "but could not allocate card structure.\n",
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index b2a23aed4428..5873c346e7e9 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -784,7 +784,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                         continue;
                 } 
                 
-                new = (st_cpc_rx_buf *)kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
+                new = kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
                 if (new == 0) {
                         cpc_tty_rx_disc_frame(pc300chan);
                         continue;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 9c3ccc669143..1c9edd97accd 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -123,8 +123,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
         unsigned char *xbuff, *rbuff;
         int len = 2* newmtu;
 
-        xbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-        rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        xbuff = kmalloc(len + 4, GFP_ATOMIC);
+        rbuff = kmalloc(len + 4, GFP_ATOMIC);
 
         if (xbuff == NULL || rbuff == NULL)  
         {
@@ -465,11 +465,11 @@ static int x25_asy_open(struct net_device *dev)
 
         len = dev->mtu * 2;
 
-        sl->rbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
+        sl->rbuff = kmalloc(len + 4, GFP_KERNEL);
         if (sl->rbuff == NULL)   {
                 goto norbuff;
         }
-        sl->xbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
+        sl->xbuff = kmalloc(len + 4, GFP_KERNEL);
         if (sl->xbuff == NULL)   {
                 goto noxbuff;
         }
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 974a8e5bec8b..efb8cf3bd8ad 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1253,7 +1253,7 @@ static char * ap_auth_make_challenge(struct ap_data *ap)
                         return NULL;
         }
 
-        tmpbuf = (char *) kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
+        tmpbuf = kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
         if (tmpbuf == NULL) {
                 PDEBUG(DEBUG_AP, "AP: kmalloc failed for challenge\n");
                 return NULL;
diff --git a/drivers/net/wireless/hostap/hostap_download.c b/drivers/net/wireless/hostap/hostap_download.c
index 24fc387bba67..c7678e67697d 100644
--- a/drivers/net/wireless/hostap/hostap_download.c
+++ b/drivers/net/wireless/hostap/hostap_download.c
@@ -201,7 +201,7 @@ static u8 * prism2_read_pda(struct net_device *dev)
                 0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,
         };
 
-        buf = (u8 *) kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
+        buf = kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
         if (buf == NULL)
                 return NULL;
 
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index a394a23b9a20..3079378fb8cd 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2252,7 +2252,7 @@ static int hostap_tx_compl_read(local_info_t *local, int error,
         if (txdesc->sw_support) {
                 len = le16_to_cpu(txdesc->data_len);
                 if (len < PRISM2_DATA_MAXLEN) {
-                        *payload = (char *) kmalloc(len, GFP_ATOMIC);
+                        *payload = kmalloc(len, GFP_ATOMIC);
                         if (*payload == NULL ||
                             hfa384x_from_bap(dev, BAP0, *payload, len)) {
                                 PDEBUG(DEBUG_EXTRA, "%s: could not read TX "
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 3b7b8063ff1c..cb08bc5db2bd 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3829,7 +3829,7 @@ static int prism2_ioctl_priv_hostapd(local_info_t *local, struct iw_point *p)
             p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
                 return -EINVAL;
 
-        param = (struct prism2_hostapd_param *) kmalloc(p->length, GFP_KERNEL);
+        param = kmalloc(p->length, GFP_KERNEL);
         if (param == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 0796be9d9e77..04c19cefa1da 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -250,7 +250,7 @@ u16 hostap_tx_callback_register(local_info_t *local,
         unsigned long flags;
         struct hostap_tx_callback_info *entry;
 
-        entry = (struct hostap_tx_callback_info *) kmalloc(sizeof(*entry),
+        entry = kmalloc(sizeof(*entry),
                                                            GFP_ATOMIC);
         if (entry == NULL)
                 return 0;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index dd9ba4aad7bb..0e94fbbf7a94 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -2246,7 +2246,7 @@ static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)
         if (priv->snapshot[0])
                 return 1;
         for (i = 0; i < 0x30; i++) {
-                priv->snapshot[i] = (u8 *) kmalloc(0x1000, GFP_ATOMIC);
+                priv->snapshot[i] = kmalloc(0x1000, GFP_ATOMIC);
                 if (!priv->snapshot[i]) {
                         IPW_DEBUG_INFO("%s: Error allocating snapshot "
                                        "buffer %d\n", priv->net_dev->name, i);
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 96606ed10076..838d510213c6 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2775,7 +2775,7 @@ prism54_hostapd(struct net_device *ndev, struct iw_point *p)
            p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
                return -EINVAL;
 
-       param = (struct prism2_hostapd_param *) kmalloc(p->length, GFP_KERNEL);
+       param = kmalloc(p->length, GFP_KERNEL);
        if (param == NULL)
                return -ENOMEM;
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 233d906c08f0..5eb81638e846 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -603,7 +603,7 @@ static wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char se
   if(lp->wavepoint_table.num_wavepoints==MAX_WAVEPOINTS)
     return NULL;
   
-  new_wavepoint=(wavepoint_history *) kmalloc(sizeof(wavepoint_history),GFP_ATOMIC);
+  new_wavepoint = kmalloc(sizeof(wavepoint_history),GFP_ATOMIC);
   if(new_wavepoint==NULL)
     return NULL;
   
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 77e11ddad836..78ea72fb8f0c 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -101,7 +101,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr
 
         /* Allocate a single memory block for values and addresses. */
         count16 = 2*count;
-        a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+        a16 = kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
                                    GFP_NOFS);
         if (!a16) {
                 dev_dbg_f(zd_chip_dev(chip),