Commit 63c5f1d8 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Hans Verkuil
Browse files

media: cx231xx: Use EP5_BUF_SIZE macro 



As Andrzej suggested, use EP5_BUF_SIZE macro to replace the other three
places of 4096 in cx231xx with EP5_BUF_SIZE.

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 8cd08e36

drivers/media/usb/cx231xx/cx231xx-417.c

+4 −5
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ static int cx231xx_load_firmware(struct cx231xx *dev) 
	u32 *p_current_fw, *p_fw;

	u32 *p_fw_data;

	int frame = 0;

	u16 _buffer_size = 4096;

	u8 *p_buffer;



	p_current_fw = vmalloc(1884180 * 4);
@@ -947,7 +946,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) 
		return -ENOMEM;

	}



	p_buffer = vmalloc(4096);

	p_buffer = vmalloc(EP5_BUF_SIZE);

	if (p_buffer == NULL) {

		dprintk(2, "FAIL!!!\n");

		vfree(p_current_fw);
@@ -1030,9 +1029,9 @@ static int cx231xx_load_firmware(struct cx231xx *dev) 


	/*download the firmware by ep5-out*/



	for (frame = 0; frame < (int)(CX231xx_FIRM_IMAGE_SIZE*20/_buffer_size);

	for (frame = 0; frame < (int)(CX231xx_FIRM_IMAGE_SIZE*20/EP5_BUF_SIZE);

	     frame++) {

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

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

			*(p_buffer + i) = (u8)(*(p_fw + (frame * 128 * 8 + (i / 4))) & 0x000000FF);

			i++;

			*(p_buffer + i) = (u8)((*(p_fw + (frame * 128 * 8 + (i / 4))) & 0x0000FF00) >> 8);
@@ -1041,7 +1040,7 @@ static int cx231xx_load_firmware(struct cx231xx *dev) 
			i++;

			*(p_buffer + i) = (u8)((*(p_fw + (frame * 128 * 8 + (i / 4))) & 0xFF000000) >> 24);

		}

		cx231xx_ep5_bulkout(dev, p_buffer, _buffer_size);

		cx231xx_ep5_bulkout(dev, p_buffer, EP5_BUF_SIZE);

	}



	p_current_fw = p_fw;

drivers/media/usb/cx231xx/cx231xx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, 
	/* De-allocates all pending stuff */

	cx231xx_uninit_isoc(dev);



	dma_q->p_left_data = kzalloc(4096, GFP_KERNEL);

	dma_q->p_left_data = kzalloc(EP5_BUF_SIZE, GFP_KERNEL);

	if (dma_q->p_left_data == NULL)

		return -ENOMEM;