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

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

V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static int get_audio_status(struct pvr2_msp3400_handler *ctxt) 


static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)

{

	ctxt->client->handler = 0;

	ctxt->hdw->audio_stat = 0;

	ctxt->client->handler = NULL;

	ctxt->hdw->audio_stat = NULL;

	kfree(ctxt);

}

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

+7 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct pvr2_context *pvr2_context_create( 
	const struct usb_device_id *devid,

	void (*setup_func)(struct pvr2_context *))

{

	struct pvr2_context *mp = 0;

	struct pvr2_context *mp = NULL;

	mp = kmalloc(sizeof(*mp),GFP_KERNEL);

	if (!mp) goto done;

	memset(mp,0,sizeof(*mp));
@@ -87,7 +87,7 @@ struct pvr2_context *pvr2_context_create( 
	mp->hdw = pvr2_hdw_create(intf,devid);

	if (!mp->hdw) {

		pvr2_context_destroy(mp);

		mp = 0;

		mp = NULL;

		goto done;

	}
@@ -145,7 +145,7 @@ void pvr2_channel_init(struct pvr2_channel *cp,struct pvr2_context *mp) 
{

	cp->hdw = mp->hdw;

	cp->mc_head = mp;

	cp->mc_next = 0;

	cp->mc_next = NULL;

	cp->mc_prev = mp->mc_last;

	if (mp->mc_last) {

		mp->mc_last->mc_next = cp;
@@ -160,8 +160,8 @@ static void pvr2_channel_disclaim_stream(struct pvr2_channel *cp) 
{

	if (!cp->stream) return;

	pvr2_stream_kill(cp->stream->stream);

	cp->stream->user = 0;

	cp->stream = 0;

	cp->stream->user = NULL;

	cp->stream = NULL;

}
@@ -179,7 +179,7 @@ void pvr2_channel_done(struct pvr2_channel *cp) 
	} else {

		mp->mc_first = cp->mc_next;

	}

	cp->hdw = 0;

	cp->hdw = NULL;

}
@@ -212,7 +212,7 @@ struct pvr2_ioread *pvr2_channel_create_mpeg_stream( 
{

	struct pvr2_ioread *cp;

	cp = pvr2_ioread_create();

	if (!cp) return 0;

	if (!cp) return NULL;

	pvr2_ioread_setup(cp,sp->stream);

	pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key));

	return cp;

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

+3 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int pvr2_ctrl_get_mask(struct pvr2_ctrl *cptr) 
/* Retrieve the control's name */

const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr)

{

	if (!cptr) return 0;

	if (!cptr) return NULL;

	return cptr->info->name;

}
@@ -166,7 +166,7 @@ const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) 
/* Retrieve the control's desc */

const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr)

{

	if (!cptr) return 0;

	if (!cptr) return NULL;

	return cptr->info->desc;

}
@@ -488,7 +488,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr, 


	LOCK_TAKE(cptr->hdw->big_lock); do {

		if (cptr->info->type == pvr2_ctl_int) {

			ret = parse_token(ptr,len,valptr,0,0);

			ret = parse_token(ptr,len,valptr,NULL,0);

			if ((ret >= 0) &&

			    ((*valptr < cptr->info->def.type_int.min_value) ||

			     (*valptr > cptr->info->def.type_int.max_value))) {

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

+3 −3
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = { 


static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt)

{

	ctxt->client->handler = 0;

	ctxt->hdw->decoder_ctrl = 0;

	ctxt->client->handler = NULL;

	ctxt->hdw->decoder_ctrl = NULL;

	kfree(ctxt);

}
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, 
static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)

{

	int ret;

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static unsigned int debugifc_isolate_word(const char *buf,unsigned int count, 
	unsigned int wlen;

	unsigned int scnt;



	wptr = 0;

	wptr = NULL;

	wlen = 0;

	scnt = debugifc_count_whitespace(buf,count);

	consume_cnt += scnt; count -= scnt; buf += scnt;