aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-08-24 11:48:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:50:37 -0400
commit655b4d16ac5e551e5c8dac5812156edfd87bf822 (patch)
treedfb8fc48d12c111d77f487d47f70fc117164bba7 /drivers/net/wireless/libertas
parent4b04f19625dcf43171b0b8d53be050a8f144c43d (diff)
[PATCH] net: Kill some unneeded allocation return value casts in libertas
kmalloc() and friends return void*, no need to cast it. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/debugfs.c2
-rw-r--r--drivers/net/wireless/libertas/ethtool.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 6d95148e8725..816f42e4f5b4 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1838,7 +1838,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const char __user *buf,
1838 char *p2; 1838 char *p2;
1839 struct debug_data *d = (struct debug_data *)f->private_data; 1839 struct debug_data *d = (struct debug_data *)f->private_data;
1840 1840
1841 pdata = (char *)kmalloc(cnt, GFP_KERNEL); 1841 pdata = kmalloc(cnt, GFP_KERNEL);
1842 if (pdata == NULL) 1842 if (pdata == NULL)
1843 return 0; 1843 return 0;
1844 1844
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index ec99cb825871..d793d843f7d5 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(struct net_device *dev,
60 60
61// mutex_lock(&priv->mutex); 61// mutex_lock(&priv->mutex);
62 62
63 adapter->prdeeprom = 63 adapter->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
64 (char *)kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
65 if (!adapter->prdeeprom) 64 if (!adapter->prdeeprom)
66 return -ENOMEM; 65 return -ENOMEM;
67 memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl)); 66 memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl));