diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-08-25 02:25:33 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-26 21:35:46 -0400 |
commit | 7c8347a91dbbb723d8ed106ec817dabac97f2bbc (patch) | |
tree | 167d78f55ea340d4df5e97805fbd5e3d5751bc98 /drivers/isdn | |
parent | c573f73ce95d7e421cb4b9928dd41ac9518fcccf (diff) |
[ISDN]: Get rid of some pointless allocation casts in common and bsd comp.
vmalloc() returns a void pointer - no need to cast the return value.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/i4l/isdn_bsdcomp.c | 5 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c index 90a23795db7e..02d9918705dd 100644 --- a/drivers/isdn/i4l/isdn_bsdcomp.c +++ b/drivers/isdn/i4l/isdn_bsdcomp.c | |||
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) | |||
341 | * Allocate space for the dictionary. This may be more than one page in | 341 | * Allocate space for the dictionary. This may be more than one page in |
342 | * length. | 342 | * length. |
343 | */ | 343 | */ |
344 | db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict)); | 344 | db->dict = vmalloc(hsize * sizeof(struct bsd_dict)); |
345 | if (!db->dict) { | 345 | if (!db->dict) { |
346 | bsd_free (db); | 346 | bsd_free (db); |
347 | return NULL; | 347 | return NULL; |
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) | |||
354 | if (!decomp) | 354 | if (!decomp) |
355 | db->lens = NULL; | 355 | db->lens = NULL; |
356 | else { | 356 | else { |
357 | db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) * | 357 | db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0])); |
358 | sizeof (db->lens[0])); | ||
359 | if (!db->lens) { | 358 | if (!db->lens) { |
360 | bsd_free (db); | 359 | bsd_free (db); |
361 | return (NULL); | 360 | return (NULL); |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index c97330b19877..ec5f4046412f 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void) | |||
2291 | int i; | 2291 | int i; |
2292 | char tmprev[50]; | 2292 | char tmprev[50]; |
2293 | 2293 | ||
2294 | if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) { | 2294 | if (!(dev = vmalloc(sizeof(isdn_dev)))) { |
2295 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); | 2295 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); |
2296 | return -EIO; | 2296 | return -EIO; |
2297 | } | 2297 | } |