Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6f76b97 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarStoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3227c860

drivers/media/video/gspca/conex.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -820,7 +820,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 




	cam = &gspca_dev->cam;

	cam = &gspca_dev->cam;

	cam->cam_mode = vga_mode;

	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->brightness = BRIGHTNESS_DEF;

	sd->contrast = CONTRAST_DEF;

	sd->contrast = CONTRAST_DEF;

drivers/media/video/gspca/etoms.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -635,10 +635,10 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	sd->sensor = id->driver_info;

	sd->sensor = id->driver_info;

	if (sd->sensor == SENSOR_PAS106) {

	if (sd->sensor == SENSOR_PAS106) {

		cam->cam_mode = sif_mode;

		cam->cam_mode = sif_mode;

		cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];

		cam->nmodes = ARRAY_SIZE(sif_mode);

	} else {

	} else {

		cam->cam_mode = vga_mode;

		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);

		gspca_dev->ctrl_dis = (1 << COLOR_IDX);

	}

	}

	sd->brightness = BRIGHTNESS_DEF;

	sd->brightness = BRIGHTNESS_DEF;

drivers/media/video/gspca/spca501.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1923,7 +1923,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 




	cam = &gspca_dev->cam;

	cam = &gspca_dev->cam;

	cam->cam_mode = vga_mode;

	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->subtype = id->driver_info;

	sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;

	sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;

	sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;

	sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;

drivers/media/video/gspca/spca506.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 




	cam = &gspca_dev->cam;

	cam = &gspca_dev->cam;

	cam->cam_mode = vga_mode;

	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->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;

	sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;

	sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;

	sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;

	sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;

drivers/media/video/gspca/sunplus.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -841,7 +841,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 
/*	case BRIDGE_SPCA504: */

/*	case BRIDGE_SPCA504: */

/*	case BRIDGE_SPCA536: */

/*	case BRIDGE_SPCA536: */

		cam->cam_mode = vga_mode;

		cam->cam_mode = vga_mode;

		cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];

		cam->nmodes =ARRAY_SIZE(vga_mode);

		break;

		break;

	case BRIDGE_SPCA533:

	case BRIDGE_SPCA533:

		cam->cam_mode = custom_mode;

		cam->cam_mode = custom_mode;
@@ -852,7 +852,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 
		break;

		break;

	case BRIDGE_SPCA504C:

	case BRIDGE_SPCA504C:

		cam->cam_mode = vga_mode2;

		cam->cam_mode = vga_mode2;

		cam->nmodes = sizeof vga_mode2 / sizeof vga_mode2[0];

		cam->nmodes = ARRAY_SIZE(vga_mode2);

		break;

		break;

	}

	}

	sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;

	sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;