diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-02-06 09:41:44 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:21 -0400 |
commit | 92374e886c7518387e6816dedfe60fc7bdfa8fdd (patch) | |
tree | 68aa4fa6ff251d7d97bcc3139d718da583f3ccbb /drivers/media/dvb/firewire/firedtv-fe.c | |
parent | 14ddc3188d50855ae2a419a6aced995e2834e5d4 (diff) |
[media] firedtv: drop obsolete backend abstraction
Since the drivers/ieee1394/ backend was removed from firedtv, its I/O no
longer needs to be abstracted as exchangeable backend methods.
Also, ieee1394 variants of module and device probe and removal are no
longer there. Move module probe and removal into firedtv-fw.c where
device probe and removal are implemented.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-fe.c')
-rw-r--r-- | drivers/media/dvb/firewire/firedtv-fe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c index d10920e2f3a2..8748a61be73d 100644 --- a/drivers/media/dvb/firewire/firedtv-fe.c +++ b/drivers/media/dvb/firewire/firedtv-fe.c | |||
@@ -36,14 +36,14 @@ static int fdtv_dvb_init(struct dvb_frontend *fe) | |||
36 | return err; | 36 | return err; |
37 | } | 37 | } |
38 | 38 | ||
39 | return fdtv->backend->start_iso(fdtv); | 39 | return fdtv_start_iso(fdtv); |
40 | } | 40 | } |
41 | 41 | ||
42 | static int fdtv_sleep(struct dvb_frontend *fe) | 42 | static int fdtv_sleep(struct dvb_frontend *fe) |
43 | { | 43 | { |
44 | struct firedtv *fdtv = fe->sec_priv; | 44 | struct firedtv *fdtv = fe->sec_priv; |
45 | 45 | ||
46 | fdtv->backend->stop_iso(fdtv); | 46 | fdtv_stop_iso(fdtv); |
47 | cmp_break_pp_connection(fdtv, fdtv->subunit, fdtv->isochannel); | 47 | cmp_break_pp_connection(fdtv, fdtv->subunit, fdtv->isochannel); |
48 | fdtv->isochannel = -1; | 48 | fdtv->isochannel = -1; |
49 | return 0; | 49 | return 0; |
@@ -165,7 +165,7 @@ static int fdtv_set_property(struct dvb_frontend *fe, struct dtv_property *tvp) | |||
165 | return 0; | 165 | return 0; |
166 | } | 166 | } |
167 | 167 | ||
168 | void fdtv_frontend_init(struct firedtv *fdtv) | 168 | void fdtv_frontend_init(struct firedtv *fdtv, const char *name) |
169 | { | 169 | { |
170 | struct dvb_frontend_ops *ops = &fdtv->fe.ops; | 170 | struct dvb_frontend_ops *ops = &fdtv->fe.ops; |
171 | struct dvb_frontend_info *fi = &ops->info; | 171 | struct dvb_frontend_info *fi = &ops->info; |
@@ -266,7 +266,7 @@ void fdtv_frontend_init(struct firedtv *fdtv) | |||
266 | dev_err(fdtv->device, "no frontend for model type %d\n", | 266 | dev_err(fdtv->device, "no frontend for model type %d\n", |
267 | fdtv->type); | 267 | fdtv->type); |
268 | } | 268 | } |
269 | strcpy(fi->name, fdtv_model_names[fdtv->type]); | 269 | strcpy(fi->name, name); |
270 | 270 | ||
271 | fdtv->fe.dvb = &fdtv->adapter; | 271 | fdtv->fe.dvb = &fdtv->adapter; |
272 | fdtv->fe.sec_priv = fdtv; | 272 | fdtv->fe.sec_priv = fdtv; |