lkml.org 
[lkml]   [2007]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 14/30] net: Kill some unneeded allocation return value casts in libertas
From
Date
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 <jesper.juhl@gmail.com>
> ---
> 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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-08-24 17:57    [W:0.132 / U:8.800 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site