mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-03 00:54:09 +08:00
V4L/DVB (9638): drivers/media: use ARRAY_SIZE
ARRAY_SIZE is more concise to use when the size of an array is divided by the size of its type or the size of its first element. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @i@ @@ @depends on i using "paren.iso"@ type T; T[] E; @@ - (sizeof(E)/sizeof(E[...])) + ARRAY_SIZE(E) @depends on i using "paren.iso"@ type T; T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
292ee46107
commit
802971257a
@ -3598,7 +3598,7 @@ static u16 MXL_GetInitRegister(struct dvb_frontend *fe, u8 *RegNum,
|
||||
76, 77, 91, 134, 135, 137, 147,
|
||||
156, 166, 167, 168, 25 };
|
||||
|
||||
*count = sizeof(RegAddr) / sizeof(u8);
|
||||
*count = ARRAY_SIZE(RegAddr);
|
||||
|
||||
status += MXL_BlockInit(fe);
|
||||
|
||||
@ -3630,7 +3630,7 @@ static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum, u8 *RegVal,
|
||||
*/
|
||||
#endif
|
||||
|
||||
*count = sizeof(RegAddr) / sizeof(u8);
|
||||
*count = ARRAY_SIZE(RegAddr);
|
||||
|
||||
for (i = 0 ; i < *count; i++) {
|
||||
RegNum[i] = RegAddr[i];
|
||||
@ -3648,7 +3648,7 @@ static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
|
||||
|
||||
u8 RegAddr[] = {43, 136};
|
||||
|
||||
*count = sizeof(RegAddr) / sizeof(u8);
|
||||
*count = ARRAY_SIZE(RegAddr);
|
||||
|
||||
for (i = 0; i < *count; i++) {
|
||||
RegNum[i] = RegAddr[i];
|
||||
|
@ -736,7 +736,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
if (fmtdesc->index == index)
|
||||
break; /* new format */
|
||||
index++;
|
||||
if (index >= sizeof fmt_tb / sizeof fmt_tb[0])
|
||||
if (index >= ARRAY_SIZE(fmt_tb))
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
@ -123,7 +123,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
||||
cam = &gspca_dev->cam;
|
||||
cam->epaddr = 0x01;
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
sd->qindex = 1; /* set the quantization table */
|
||||
return 0;
|
||||
}
|
||||
|
@ -633,10 +633,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
||||
sd->subtype = id->driver_info;
|
||||
if (sd->subtype != LogitechClickSmart310) {
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
} else {
|
||||
cam->cam_mode = sif_mode;
|
||||
cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(sif_mode);
|
||||
}
|
||||
sd->qindex = 5;
|
||||
sd->brightness = BRIGHTNESS_DEF;
|
||||
|
@ -159,7 +159,7 @@ static struct saa7134_tvaudio tvaudio[] = {
|
||||
.mode = TVAUDIO_FM_MONO,
|
||||
}
|
||||
};
|
||||
#define TVAUDIO (sizeof(tvaudio)/sizeof(struct saa7134_tvaudio))
|
||||
#define TVAUDIO ARRAY_SIZE(tvaudio)
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user