mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
V4L/DVB (12478): ARRAY_SIZE changes
These changes were a direct result of using a semantic patch More information can be found at http://www.emn.fr/x-info/coccinelle/ [mchehab@redhat.com: fix a merge conflict] Signed-off-by: Stoyan Gaydarov <sgayda2@uiuc.edu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
3227c860b6
commit
d6f76b979c
7 changed files with 10 additions and 10 deletions
|
@ -820,7 +820,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
|
||||
cam = &gspca_dev->cam;
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
|
||||
sd->brightness = BRIGHTNESS_DEF;
|
||||
sd->contrast = CONTRAST_DEF;
|
||||
|
|
|
@ -635,10 +635,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
sd->sensor = id->driver_info;
|
||||
if (sd->sensor == SENSOR_PAS106) {
|
||||
cam->cam_mode = sif_mode;
|
||||
cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(sif_mode);
|
||||
} else {
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
gspca_dev->ctrl_dis = (1 << COLOR_IDX);
|
||||
}
|
||||
sd->brightness = BRIGHTNESS_DEF;
|
||||
|
|
|
@ -1923,7 +1923,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
|
||||
cam = &gspca_dev->cam;
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
sd->subtype = id->driver_info;
|
||||
sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;
|
||||
sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;
|
||||
|
|
|
@ -286,7 +286,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
|
||||
cam = &gspca_dev->cam;
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode);
|
||||
sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
|
||||
sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
|
||||
sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
|
||||
|
|
|
@ -841,7 +841,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
/* case BRIDGE_SPCA504: */
|
||||
/* case BRIDGE_SPCA536: */
|
||||
cam->cam_mode = vga_mode;
|
||||
cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
|
||||
cam->nmodes =ARRAY_SIZE(vga_mode);
|
||||
break;
|
||||
case BRIDGE_SPCA533:
|
||||
cam->cam_mode = custom_mode;
|
||||
|
@ -852,7 +852,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|||
break;
|
||||
case BRIDGE_SPCA504C:
|
||||
cam->cam_mode = vga_mode2;
|
||||
cam->nmodes = sizeof vga_mode2 / sizeof vga_mode2[0];
|
||||
cam->nmodes = ARRAY_SIZE(vga_mode2);
|
||||
break;
|
||||
}
|
||||
sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
|
||||
|
|
|
@ -7574,7 +7574,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
|
|||
static const struct sd_desc sd_desc = {
|
||||
.name = MODULE_NAME,
|
||||
.ctrls = sd_ctrls,
|
||||
.nctrls = sizeof sd_ctrls / sizeof sd_ctrls[0],
|
||||
.nctrls = ARRAY_SIZE(sd_ctrls),
|
||||
.config = sd_config,
|
||||
.init = sd_init,
|
||||
.start = sd_start,
|
||||
|
|
|
@ -646,14 +646,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
|
|||
tvee->has_radio = 1;
|
||||
}
|
||||
|
||||
if (tuner1 < sizeof(hauppauge_tuner)/sizeof(struct HAUPPAUGE_TUNER)) {
|
||||
if (tuner1 < ARRAY_SIZE(hauppauge_tuner)) {
|
||||
tvee->tuner_type = hauppauge_tuner[tuner1].id;
|
||||
t_name1 = hauppauge_tuner[tuner1].name;
|
||||
} else {
|
||||
t_name1 = "unknown";
|
||||
}
|
||||
|
||||
if (tuner2 < sizeof(hauppauge_tuner)/sizeof(struct HAUPPAUGE_TUNER)) {
|
||||
if (tuner2 < ARRAY_SIZE(hauppauge_tuner)) {
|
||||
tvee->tuner2_type = hauppauge_tuner[tuner2].id;
|
||||
t_name2 = hauppauge_tuner[tuner2].name;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue