Commit 27c7b710 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5092): Pvrusb2: Use ARRAY_SIZE wherever possible 



Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ca545f7c

drivers/media/video/pvrusb2/pvrusb2-audio.c

+3 −6
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ static int msp3400_check(struct pvr2_msp3400_handler *ctxt) 
	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);

	     idx++) {

	for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {

		msk = 1 << idx;

		if (ctxt->stale_mask & msk) continue;

		if (msp3400_ops[idx].check(ctxt)) {
@@ -115,8 +114,7 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt) 
	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);

	     idx++) {

	for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {

		msk = 1 << idx;

		if (!(ctxt->stale_mask & msk)) continue;

		ctxt->stale_mask &= ~msk;
@@ -159,8 +157,7 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) 
	ctxt->i2c_handler.func_table = &msp3400_funcs;

	ctxt->client = cp;

	ctxt->hdw = hdw;

	ctxt->stale_mask = (1 << (sizeof(msp3400_ops)/

				  sizeof(msp3400_ops[0]))) - 1;

	ctxt->stale_mask = (1 << ARRAY_SIZE(msp3400_ops)) - 1;

	cp->handler = &ctxt->i2c_handler;

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",

		   cp->client->addr);

drivers/media/video/pvrusb2/pvrusb2-ctrl.c

+2 −3
Original line number Diff line number Diff line
@@ -515,9 +515,8 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr, 
			}

			if (maskptr) *maskptr = ~0;

		} else if (cptr->info->type == pvr2_ctl_bool) {

			ret = parse_token(

				ptr,len,valptr,boolNames,

				sizeof(boolNames)/sizeof(boolNames[0]));

			ret = parse_token(ptr,len,valptr,boolNames,

					  ARRAY_SIZE(boolNames));

			if (ret == 1) {

				*valptr = *valptr ? !0 : 0;

			} else if (ret == 0) {

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c

+3 −6
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ static int decoder_check(struct pvr2_v4l_cx2584x *ctxt) 
	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);

	     idx++) {

	for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {

		msk = 1 << idx;

		if (ctxt->stale_mask & msk) continue;

		if (decoder_ops[idx].check(ctxt)) {
@@ -167,8 +166,7 @@ static void decoder_update(struct pvr2_v4l_cx2584x *ctxt) 
	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);

	     idx++) {

	for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {

		msk = 1 << idx;

		if (!(ctxt->stale_mask & msk)) continue;

		ctxt->stale_mask &= ~msk;
@@ -242,8 +240,7 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw, 
	ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset;

	ctxt->client = cp;

	ctxt->hdw = hdw;

	ctxt->stale_mask = (1 << (sizeof(decoder_ops)/

				  sizeof(decoder_ops[0]))) - 1;

	ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;

	hdw->decoder_ctrl = &ctxt->ctrl;

	cp->handler = &ctxt->handler;

	{

drivers/media/video/pvrusb2/pvrusb2-debugifc.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static unsigned long debugifc_find_mask(const char *buf,unsigned int count) 
{

	struct debugifc_mask_item *mip;

	unsigned int idx;

	for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {

	for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {

		mip = mask_items + idx;

		if (debugifc_match_keyword(buf,count,mip->name)) {

			return mip->msk;
@@ -169,7 +169,7 @@ static int debugifc_print_mask(char *buf,unsigned int sz, 
	unsigned int idx;

	int bcnt = 0;

	int ccnt;

	for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {

	for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {

		mip = mask_items + idx;

		if (!(mip->msk & msk)) continue;

		ccnt = scnprintf(buf,sz,"%s%c%s",

drivers/media/video/pvrusb2/pvrusb2-eeprom.c

+2 −3
Original line number Diff line number Diff line
@@ -102,9 +102,8 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw) 
		}

		msg[1].len = pcnt;

		msg[1].buf = eeprom+tcnt;

		if ((ret = i2c_transfer(

			     &hdw->i2c_adap,

			     msg,sizeof(msg)/sizeof(msg[0]))) != 2) {

		if ((ret = i2c_transfer(&hdw->i2c_adap,

					msg,ARRAY_SIZE(msg))) != 2) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

				   "eeprom fetch set offs err=%d",ret);

			kfree(eeprom);