Re: [PATCH 14/30] net: Kill some unneeded allocation return value casts in libertas

2007-08-24 Thread Dan Williams 
On Fri, 2007-08-24 at 02:03 +0200, Jesper Juhl wrote:
 kmalloc() and friends return void*, no need to cast it.

Applied to libertas-2.6 'for-linville' branch, thanks.

Dan

 Signed-off-by: Jesper Juhl [EMAIL PROTECTED]
 ---
  drivers/net/wireless/libertas/debugfs.c |2 +-
  drivers/net/wireless/libertas/ethtool.c |3 +--
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/wireless/libertas/debugfs.c 
 b/drivers/net/wireless/libertas/debugfs.c
 index 715cbda..6ade63e 100644
 --- a/drivers/net/wireless/libertas/debugfs.c
 +++ b/drivers/net/wireless/libertas/debugfs.c
 @@ -1839,7 +1839,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const 
 char __user *buf,
   char *p2;
   struct debug_data *d = (struct debug_data *)f-private_data;
  
 - pdata = (char *)kmalloc(cnt, GFP_KERNEL);
 + pdata = kmalloc(cnt, GFP_KERNEL);
   if (pdata == NULL)
   return 0;
  
 diff --git a/drivers/net/wireless/libertas/ethtool.c 
 b/drivers/net/wireless/libertas/ethtool.c
 index 96f1974..7dad493 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,
  
  //  mutex_lock(priv-mutex);
  
 - adapter-prdeeprom =
 - (char *)kmalloc(eeprom-len+sizeof(regctrl), GFP_KERNEL);
 + adapter-prdeeprom = kmalloc(eeprom-len+sizeof(regctrl), GFP_KERNEL);
   if (!adapter-prdeeprom)
   return -ENOMEM;
   memcpy(adapter-prdeeprom, regctrl, sizeof(regctrl));

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 14/30] net: Kill some unneeded allocation return value casts in libertas

2007-08-23 Thread Jesper Juhl 
kmalloc() and friends return void*, no need to cast it.

Signed-off-by: Jesper Juhl [EMAIL PROTECTED]
---
 drivers/net/wireless/libertas/debugfs.c |2 +-
 drivers/net/wireless/libertas/ethtool.c |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/libertas/debugfs.c 
b/drivers/net/wireless/libertas/debugfs.c
index 715cbda..6ade63e 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1839,7 +1839,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const 
char __user *buf,
char *p2;
struct debug_data *d = (struct debug_data *)f-private_data;
 
-   pdata = (char *)kmalloc(cnt, GFP_KERNEL);
+   pdata = kmalloc(cnt, GFP_KERNEL);
if (pdata == NULL)
return 0;
 
diff --git a/drivers/net/wireless/libertas/ethtool.c 
b/drivers/net/wireless/libertas/ethtool.c
index 96f1974..7dad493 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,
 
 //  mutex_lock(priv-mutex);
 
-   adapter-prdeeprom =
-   (char *)kmalloc(eeprom-len+sizeof(regctrl), GFP_KERNEL);
+   adapter-prdeeprom = kmalloc(eeprom-len+sizeof(regctrl), GFP_KERNEL);
if (!adapter-prdeeprom)
return -ENOMEM;
memcpy(adapter-prdeeprom, regctrl, sizeof(regctrl));
-- 
1.5.2.2

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html