hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (7692): pvrusb2-dvb: Further clean up dvb init/tear-down 

Move pvr2_dvb_adapter usage out of the pvrusb2 driver core - it's
really private to the pvrusb2-dvb module and nothing outside of the
dvb implementation should care about it.  Creation / destruction of
the pvr2_dvb_adapter instance is now contained entirely within
pvrusb2-dvb.c.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mike Isely 2008-02-09 19:47:07 -03:00 committed by Mauro Carvalho Chehab
parent 129a2f5efd
commit c5317b17f6
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/video/pvrusb2/pvrusb2-dvb.c
View File

@ -381,12 +381,13 @@ static int pvr2_dvb_frontend_exit(struct pvr2_dvb_adapter *adap)
return 0; return 0;
} }
static void pvr2_dvb_done(struct pvr2_dvb_adapter *adap) static void pvr2_dvb_destroy(struct pvr2_dvb_adapter *adap)
{ {
pvr2_dvb_stream_end(adap); pvr2_dvb_stream_end(adap);
pvr2_dvb_frontend_exit(adap); pvr2_dvb_frontend_exit(adap);
pvr2_dvb_adapter_exit(adap); pvr2_dvb_adapter_exit(adap);
pvr2_channel_done(&adap->channel); pvr2_channel_done(&adap->channel);
kfree(adap);
} }
static void pvr2_dvb_internal_check(struct pvr2_channel *chp) static void pvr2_dvb_internal_check(struct pvr2_channel *chp)
@ -394,10 +395,10 @@ static void pvr2_dvb_internal_check(struct pvr2_channel *chp)
struct pvr2_dvb_adapter *adap; struct pvr2_dvb_adapter *adap;
adap = container_of(chp, struct pvr2_dvb_adapter, channel); adap = container_of(chp, struct pvr2_dvb_adapter, channel);
if (!adap->channel.mc_head->disconnect_flag) return; if (!adap->channel.mc_head->disconnect_flag) return;
pvr2_dvb_done(adap); pvr2_dvb_destroy(adap);
} }
int pvr2_dvb_init(struct pvr2_context *pvr) struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr)
{ {
int ret = 0; int ret = 0;
struct pvr2_dvb_adapter *adap; struct pvr2_dvb_adapter *adap;
@ -406,21 +407,22 @@ int pvr2_dvb_init(struct pvr2_context *pvr)
the DVB side of the driver either. For now. */ the DVB side of the driver either. For now. */
return 0; return 0;
} }
adap = &pvr->hdw->dvb; adap = kzalloc(sizeof(*adap), GFP_KERNEL);
if (!adap) return adap;
pvr2_channel_init(&adap->channel, pvr); pvr2_channel_init(&adap->channel, pvr);
adap->channel.check_func = pvr2_dvb_internal_check; adap->channel.check_func = pvr2_dvb_internal_check;
init_waitqueue_head(&adap->buffer_wait_data); init_waitqueue_head(&adap->buffer_wait_data);
mutex_init(&pvr->hdw->dvb.lock); mutex_init(&adap->lock);
ret = pvr2_dvb_adapter_init(&pvr->hdw->dvb); ret = pvr2_dvb_adapter_init(adap);
if (ret < 0) goto fail1; if (ret < 0) goto fail1;
ret = pvr2_dvb_frontend_init(&pvr->hdw->dvb); ret = pvr2_dvb_frontend_init(adap);
if (ret < 0) goto fail2; if (ret < 0) goto fail2;
return 0; return adap;
fail2: fail2:
pvr2_dvb_adapter_exit(adap); pvr2_dvb_adapter_exit(adap);
fail1: fail1:
pvr2_channel_done(&adap->channel); pvr2_channel_done(&adap->channel);
return ret; return NULL;
} }

2
drivers/media/video/pvrusb2/pvrusb2-dvb.h
View File

@ -36,6 +36,6 @@ struct pvr2_dvb_props {
int (*tuner_attach) (struct pvr2_dvb_adapter *); int (*tuner_attach) (struct pvr2_dvb_adapter *);
}; };
int pvr2_dvb_init(struct pvr2_context *pvr); struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr);
#endif /* __PVRUSB2_DVB_H__ */ #endif /* __PVRUSB2_DVB_H__ */

3
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
View File

@ -41,7 +41,6 @@
#include "pvrusb2-io.h" #include "pvrusb2-io.h"
#include <media/cx2341x.h> #include <media/cx2341x.h>
#include "pvrusb2-devattr.h" #include "pvrusb2-devattr.h"
#include "pvrusb2-dvb.h"
/* Legal values for PVR2_CID_HSM */ /* Legal values for PVR2_CID_HSM */
#define PVR2_CVAL_HSM_FAIL 0 #define PVR2_CVAL_HSM_FAIL 0
@ -374,8 +373,6 @@ struct pvr2_hdw {
struct pvr2_ctrl *controls; struct pvr2_ctrl *controls;
unsigned int control_cnt; unsigned int control_cnt;
struct pvr2_dvb_adapter dvb;
}; };
/* This function gets the current frequency */ /* This function gets the current frequency */

2
drivers/media/video/pvrusb2/pvrusb2-main.c
View File

@ -62,7 +62,7 @@ static void pvr_setup_attach(struct pvr2_context *pvr)
pvr2_v4l2_create(pvr); pvr2_v4l2_create(pvr);
#ifdef CONFIG_VIDEO_PVRUSB2_DVB #ifdef CONFIG_VIDEO_PVRUSB2_DVB
/* Create association with dvb layer */ /* Create association with dvb layer */
pvr2_dvb_init(pvr); pvr2_dvb_create(pvr);
#endif #endif
#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS
pvr2_sysfs_create(pvr,class_ptr); pvr2_sysfs_create(pvr,class_ptr);