From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Wed, 18 Feb 2015 15:09:27 +0000 (-0300)
Subject: [media] dvb core: rename the media controller entities
X-Git-Tag: v4.1-rc1~59^2~1^2~372
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e4fd3bc5049b67419ee91b3d4fee2d39e48d5dc2;p=karo-tx-linux.git

[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>
---

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 = {
 	.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 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 = {
 	.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 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 = {
 	.users = 1,
 	.writers = 1,
 #if defined(CONFIG_MEDIA_CONTROLLER_DVB)
-	.name = "dvb net",
+	.name = "dvb-net",
 #endif
 	.fops = &dvb_net_fops,
 };