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: Jinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index c5e21785fafe286501597ab385fa941cbc8015e7..fe4410a5e128489557dd1cc124026da43a38955f 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -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;

diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
index 57a8b4780a7d6d1033ca1346ffdb2b2f995262d7..7b7e2a26ef93b9c2ac86178bc78736129a27972b 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-core.c
+++ b/drivers/media/usb/cx231xx/cx231xx-core.c
@@ -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;