Commit 6850aeab authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

media: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 59e2623b

drivers/media/common/saa7146/saa7146_core.c

+6 −9
Original line number Diff line number Diff line
@@ -421,23 +421,20 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	err = -ENOMEM;



	/* get memory for various stuff */

	dev->d_rps0.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,

	dev->d_rps0.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,

						     &dev->d_rps0.dma_handle);

	if (!dev->d_rps0.cpu_addr)

		goto err_free_irq;

	memset(dev->d_rps0.cpu_addr, 0x0, SAA7146_RPS_MEM);



	dev->d_rps1.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,

	dev->d_rps1.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,

						     &dev->d_rps1.dma_handle);

	if (!dev->d_rps1.cpu_addr)

		goto err_free_rps0;

	memset(dev->d_rps1.cpu_addr, 0x0, SAA7146_RPS_MEM);



	dev->d_i2c.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,

	dev->d_i2c.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,

						    &dev->d_i2c.dma_handle);

	if (!dev->d_i2c.cpu_addr)

		goto err_free_rps1;

	memset(dev->d_i2c.cpu_addr, 0x0, SAA7146_RPS_MEM);



	/* the rest + print status message */

drivers/media/common/saa7146/saa7146_fops.c

+3 −2
Original line number Diff line number Diff line
@@ -520,14 +520,15 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) 
	   configuration data) */

	dev->ext_vv_data = ext_vv;



	vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);

	vv->d_clipping.cpu_addr =

		pci_zalloc_consistent(dev->pci, SAA7146_CLIPPING_MEM,

				      &vv->d_clipping.dma_handle);

	if( NULL == vv->d_clipping.cpu_addr ) {

		ERR("out of memory. aborting.\n");

		kfree(vv);

		v4l2_ctrl_handler_free(hdl);

		return -1;

	}

	memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);



	saa7146_video_uops.init(dev,vv);

	if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)

drivers/media/pci/bt8xx/bt878.c

+4 −12
Original line number Diff line number Diff line
@@ -101,28 +101,20 @@ static int bt878_mem_alloc(struct bt878 *bt) 
	if (!bt->buf_cpu) {

		bt->buf_size = 128 * 1024;



		bt->buf_cpu =

		    pci_alloc_consistent(bt->dev, bt->buf_size,

		bt->buf_cpu = pci_zalloc_consistent(bt->dev, bt->buf_size,

						    &bt->buf_dma);



		if (!bt->buf_cpu)

			return -ENOMEM;



		memset(bt->buf_cpu, 0, bt->buf_size);

	}



	if (!bt->risc_cpu) {

		bt->risc_size = PAGE_SIZE;

		bt->risc_cpu =

		    pci_alloc_consistent(bt->dev, bt->risc_size,

		bt->risc_cpu = pci_zalloc_consistent(bt->dev, bt->risc_size,

						     &bt->risc_dma);



		if (!bt->risc_cpu) {

			bt878_mem_free(bt);

			return -ENOMEM;

		}



		memset(bt->risc_cpu, 0, bt->risc_size);

	}



	return 0;

drivers/media/pci/ngene/ngene-core.c

+3 −4
Original line number Diff line number Diff line
@@ -1075,12 +1075,11 @@ static int AllocCommonBuffers(struct ngene *dev) 
	dev->ngenetohost = dev->FWInterfaceBuffer + 256;

	dev->EventBuffer = dev->FWInterfaceBuffer + 512;



	dev->OverflowBuffer = pci_alloc_consistent(dev->pci_dev,

	dev->OverflowBuffer = pci_zalloc_consistent(dev->pci_dev,

						    OVERFLOW_BUFFER_SIZE,

						    &dev->PAOverflowBuffer);

	if (!dev->OverflowBuffer)

		return -ENOMEM;

	memset(dev->OverflowBuffer, 0, OVERFLOW_BUFFER_SIZE);



	for (i = STREAM_VIDEOIN1; i < MAX_STREAM; i++) {

		int type = dev->card_info->io_type[i];

drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c

+3 −8
Original line number Diff line number Diff line
@@ -803,10 +803,8 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) 
{

	int i;



	ttusb->iso_buffer = pci_alloc_consistent(NULL,

						 ISO_FRAME_SIZE *

						 FRAMES_PER_ISO_BUF *

						 ISO_BUF_COUNT,

	ttusb->iso_buffer = pci_zalloc_consistent(NULL,

						  ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT,

						  &ttusb->iso_dma_handle);



	if (!ttusb->iso_buffer) {
@@ -815,9 +813,6 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) 
		return -ENOMEM;

	}



	memset(ttusb->iso_buffer, 0,

	       ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT);



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

		struct urb *urb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE