summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-18 15:09:27 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-26 11:44:19 (GMT)
commite4fd3bc5049b67419ee91b3d4fee2d39e48d5dc2 (patch)
treec6376c42a4aba7f22328e512d9cfd5bb8ef6c816
parentdaf77bd9c21c550252582551ee87e883eed7db00 (diff)
downloadlinux-e4fd3bc5049b67419ee91b3d4fee2d39e48d5dc2.tar.xz
[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>
-rw-r--r--drivers/media/dvb-core/dmxdev.c4
-rw-r--r--drivers/media/dvb-core/dvb_ca_en50221.c2
-rw-r--r--drivers/media/dvb-core/dvb_net.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 2835924..d0e3f9d 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 = {
.users = 1,
.writers = 1,
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
- .name = "demux",
+ .name = "dvb-demux",
#endif
.fops = &dvb_demux_fops
};
@@ -1217,7 +1217,7 @@ static const struct dvb_device dvbdev_dvr = {
.readers = 1,
.users = 1,
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
- .name = "dvr",
+ .name = "dvb-dvr",
#endif
.fops = &dvb_dvr_fops
};
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 2bf28eb..55a217f 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 = {
.readers = 1,
.writers = 1,
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
- .name = "ca_en50221",
+ .name = "dvb-ca-en50221",
#endif
.fops = &dvb_ca_fops,
};
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 4099005..1508d91 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 = {
.users = 1,
.writers = 1,
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
- .name = "dvb net",
+ .name = "dvb-net",
#endif
.fops = &dvb_net_fops,
};