diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-18 10:09:27 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 06:44:19 -0500 |
| commit | e4fd3bc5049b67419ee91b3d4fee2d39e48d5dc2 (patch) | |
| tree | c6376c42a4aba7f22328e512d9cfd5bb8ef6c816 /drivers/media/dvb-core | |
| parent | daf77bd9c21c550252582551ee87e883eed7db00 (diff) | |
[media] dvb core: rename the media controller entities
Prefix all DVB media controller entities with "dvb-" and use dash
instead of underline at the names.
Requested-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core')
| -rw-r--r-- | drivers/media/dvb-core/dmxdev.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb-core/dvb_ca_en50221.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-core/dvb_net.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index 2835924955a4..d0e3f9d85f34 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c | |||
| @@ -1141,7 +1141,7 @@ static const struct dvb_device dvbdev_demux = { | |||
| 1141 | .users = 1, | 1141 | .users = 1, |
| 1142 | .writers = 1, | 1142 | .writers = 1, |
| 1143 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 1143 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 1144 | .name = "demux", | 1144 | .name = "dvb-demux", |
| 1145 | #endif | 1145 | #endif |
| 1146 | .fops = &dvb_demux_fops | 1146 | .fops = &dvb_demux_fops |
| 1147 | }; | 1147 | }; |
| @@ -1217,7 +1217,7 @@ static const struct dvb_device dvbdev_dvr = { | |||
| 1217 | .readers = 1, | 1217 | .readers = 1, |
| 1218 | .users = 1, | 1218 | .users = 1, |
| 1219 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 1219 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 1220 | .name = "dvr", | 1220 | .name = "dvb-dvr", |
| 1221 | #endif | 1221 | #endif |
| 1222 | .fops = &dvb_dvr_fops | 1222 | .fops = &dvb_dvr_fops |
| 1223 | }; | 1223 | }; |
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index 2bf28eb97a64..55a217f0ad0e 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c | |||
| @@ -1644,7 +1644,7 @@ static const struct dvb_device dvbdev_ca = { | |||
| 1644 | .readers = 1, | 1644 | .readers = 1, |
| 1645 | .writers = 1, | 1645 | .writers = 1, |
| 1646 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 1646 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 1647 | .name = "ca_en50221", | 1647 | .name = "dvb-ca-en50221", |
| 1648 | #endif | 1648 | #endif |
| 1649 | .fops = &dvb_ca_fops, | 1649 | .fops = &dvb_ca_fops, |
| 1650 | }; | 1650 | }; |
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c index 40990058b4bc..1508d918205d 100644 --- a/drivers/media/dvb-core/dvb_net.c +++ b/drivers/media/dvb-core/dvb_net.c | |||
| @@ -1467,7 +1467,7 @@ static const struct dvb_device dvbdev_net = { | |||
| 1467 | .users = 1, | 1467 | .users = 1, |
| 1468 | .writers = 1, | 1468 | .writers = 1, |
| 1469 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 1469 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 1470 | .name = "dvb net", | 1470 | .name = "dvb-net", |
| 1471 | #endif | 1471 | #endif |
| 1472 | .fops = &dvb_net_fops, | 1472 | .fops = &dvb_net_fops, |
| 1473 | }; | 1473 | }; |
