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

Commit 32414878 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

Staging: Drop memory allocation cast 

Drop cast on the result of kmalloc and similar functions.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
type T;
@@

- (T *)
  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a05d08c4

drivers/staging/comedi/drivers/unioxx5.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev, 
		return -EIO;

	}



	usp = (struct unioxx5_subd_priv *)kzalloc(sizeof(*usp), GFP_KERNEL);

	usp = kzalloc(sizeof(*usp), GFP_KERNEL);



	if (usp == NULL) {

		printk(KERN_ERR "comedi%d: erorr! --> out of memory!\n", minor);

drivers/staging/crystalhd/crystalhd_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ int crystalhd_create_dio_pool(struct crystalhd_adp *adp, uint32_t max_pages) 
	       BC_LINK_SG_POOL_SZ, max_pages, asz, adp->fill_byte_pool);



	for (i = 0; i < BC_LINK_SG_POOL_SZ; i++) {

		temp = (uint8_t *)kzalloc(asz, GFP_KERNEL);

		temp = kzalloc(asz, GFP_KERNEL);

		if ((temp) == NULL) {

			BCMLOG_ERR("Failed to alloc %d mem\n", asz);

			return -ENOMEM;

drivers/staging/cx25821/cx25821-audio-upstream.c

+2 −4
Original line number Diff line number Diff line
@@ -751,8 +751,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 


	if (dev->input_audiofilename) {

		str_length = strlen(dev->input_audiofilename);

		dev->_audiofilename =

		    (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_audiofilename)

			goto error;
@@ -766,8 +765,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
		}

	} else {

		str_length = strlen(_defaultAudioName);

		dev->_audiofilename =

		    (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_audiofilename)

			goto error;

drivers/staging/cx25821/cx25821-video-upstream-ch2.c

+2 −4
Original line number Diff line number Diff line
@@ -769,8 +769,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 


	if (dev->input_filename_ch2) {

		str_length = strlen(dev->input_filename_ch2);

		dev->_filename_ch2 =

		    (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_filename_ch2)

			goto error;
@@ -779,8 +778,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 
		       str_length + 1);

	} else {

		str_length = strlen(dev->_defaultname_ch2);

		dev->_filename_ch2 =

		    (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_filename_ch2)

			goto error;

drivers/staging/cx25821/cx25821-video-upstream.c

+2 −2
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 


	if (dev->input_filename) {

		str_length = strlen(dev->input_filename);

		dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_filename)

			goto error;
@@ -833,7 +833,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 
		memcpy(dev->_filename, dev->input_filename, str_length + 1);

	} else {

		str_length = strlen(dev->_defaultname);

		dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);

		dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);



		if (!dev->_filename)

			goto error;