Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c8347a9 authored by Jesper Juhl's avatar Jesper Juhl Committed by David S. Miller
Browse files

[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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c573f73c

drivers/isdn/i4l/isdn_bsdcomp.c

+2 −3
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) 
	 * Allocate space for the dictionary. This may be more than one page in

	 * length.

	 */

	db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));

	db->dict = vmalloc(hsize * sizeof(struct bsd_dict));

	if (!db->dict) {

		bsd_free (db);

		return NULL;
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) 
	if (!decomp)

		db->lens = NULL;

	else {

		db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *

			sizeof (db->lens[0]));

		db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));

		if (!db->lens) {

			bsd_free (db);

			return (NULL);

drivers/isdn/i4l/isdn_common.c

+1 −1
Original line number Diff line number Diff line
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void) 
	int i;

	char tmprev[50];



	if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) {

	if (!(dev = vmalloc(sizeof(isdn_dev)))) {

		printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");

		return -EIO;

	}