* [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph()
@ 2015-03-02 14:02 Mauro Carvalho Chehab
2015-03-02 14:02 ` [PATCH 2/2] [media] dvb: Avoid warnings when compiled without the media controller Mauro Carvalho Chehab
2015-03-02 14:06 ` [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Hans Verkuil
0 siblings, 2 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-03-02 14:02 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Antti Palosaari,
Matthias Schwarzott, Hans Verkuil,
Rafael Lourenço de Lima Chehab
Instead of using media_dev argument for dvb_create_media_graph(),
use the adapter.
That allows to create a stub for this function, if compiled
without DVB support, avoiding to add extra if's at the drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index dd3c1516013f..387db145d37e 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -1185,7 +1185,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
if (smsdvb_debugfs_create(client) < 0)
pr_info("failed to create debugfs node\n");
- dvb_create_media_graph(coredev->media_dev);
+ dvb_create_media_graph(&client->adapter);
pr_info("DVB interface registered.\n");
return 0;
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 0af9d0c5f889..13bb57f0457f 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -381,9 +381,10 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
EXPORT_SYMBOL(dvb_unregister_device);
-void dvb_create_media_graph(struct media_device *mdev)
-{
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+void dvb_create_media_graph(struct dvb_adapter *adap)
+{
+ struct media_device *mdev = adap->mdev;
struct media_entity *entity, *tuner = NULL, *fe = NULL;
struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL;
@@ -421,9 +422,9 @@ void dvb_create_media_graph(struct media_device *mdev)
if (demux && ca)
media_entity_create_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED);
-#endif
}
EXPORT_SYMBOL_GPL(dvb_create_media_graph);
+#endif
static int dvbdev_check_free_adapter_num(int num)
{
diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
index 467c1311bd4c..caf4d4791a8b 100644
--- a/drivers/media/dvb-core/dvbdev.h
+++ b/drivers/media/dvb-core/dvbdev.h
@@ -122,7 +122,12 @@ extern int dvb_register_device (struct dvb_adapter *adap,
int type);
extern void dvb_unregister_device (struct dvb_device *dvbdev);
-void dvb_create_media_graph(struct media_device *mdev);
+
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+void dvb_create_media_graph(struct dvb_adapter *adap);
+#else
+static inline void dvb_create_media_graph(struct dvb_adapter *adap) {};
+#endif
extern int dvb_generic_open (struct inode *inode, struct file *file);
extern int dvb_generic_release (struct inode *inode, struct file *file);
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 44229a2c2d32..8bf2baae387f 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -540,9 +540,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
/* register network adapter */
dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
- dvb_create_media_graph(dev->media_dev);
-#endif
+ dvb_create_media_graph(&dvb->adapter);
+
return 0;
fail_fe_conn:
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 0666c8f33ac7..08a3cd1c8b44 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -702,7 +702,7 @@ static int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
}
}
- dvb_create_media_graph(adap->dvb_adap.mdev);
+ dvb_create_media_graph(&adap->dvb_adap);
return 0;
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index a7bc4535c58f..6c9f5ecf949c 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -320,7 +320,7 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap)
adap->num_frontends_initialized++;
}
- dvb_create_media_graph(adap->dvb_adap.mdev);
+ dvb_create_media_graph(&adap->dvb_adap);
return 0;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] [media] dvb: Avoid warnings when compiled without the media controller
2015-03-02 14:02 [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Mauro Carvalho Chehab
@ 2015-03-02 14:02 ` Mauro Carvalho Chehab
2015-03-02 14:06 ` [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Hans Verkuil
1 sibling, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-03-02 14:02 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Antti Palosaari,
Rafael Lourenço de Lima Chehab
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c: In function ‘dvb_usbv2_adapter_dvb_exit’:
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:531:25: warning: unused variable ‘d’ [-Wunused-variable]
struct dvb_usb_device *d = adap_to_d(adap);
^
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c:403:13: warning: ‘dvb_usbv2_media_device_register’ defined but not used [-Wunused-function]
static void dvb_usbv2_media_device_register(struct dvb_usb_adapter *adap)
drivers/media/usb/dvb-usb/dvb-usb-dvb.c:97:13: warning: ‘dvb_usb_media_device_register’ defined but not used [-Wunused-function]
static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap)
^
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index 387db145d37e..c739725ca7ee 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -611,9 +611,9 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
static void smsdvb_media_device_unregister(struct smsdvb_client_t *client)
{
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
struct smscore_device_t *coredev = client->coredev;
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
if (!coredev->media_dev)
return;
media_device_unregister(coredev->media_dev);
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 08a3cd1c8b44..8bd08ba4f869 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -467,9 +467,7 @@ static int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->dvb_adap.priv = adap;
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
dvb_usbv2_media_device_register(adap);
-#endif
if (d->props->read_mac_address) {
ret = d->props->read_mac_address(adap,
@@ -528,8 +526,6 @@ err_dvb_register_adapter:
static int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap)
{
- struct dvb_usb_device *d = adap_to_d(adap);
-
dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
adap->id);
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index 6c9f5ecf949c..980d976960d9 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -153,9 +153,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
}
adap->dvb_adap.priv = adap;
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
dvb_usb_media_device_register(adap);
-#endif
if (adap->dev->props.read_mac_address) {
if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph()
2015-03-02 14:02 [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Mauro Carvalho Chehab
2015-03-02 14:02 ` [PATCH 2/2] [media] dvb: Avoid warnings when compiled without the media controller Mauro Carvalho Chehab
@ 2015-03-02 14:06 ` Hans Verkuil
2015-03-02 14:34 ` Mauro Carvalho Chehab
1 sibling, 1 reply; 4+ messages in thread
From: Hans Verkuil @ 2015-03-02 14:06 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Antti Palosaari, Matthias Schwarzott,
Hans Verkuil, Rafael Lourenço de Lima Chehab
Hi Mauro,
Small nitpick:
On 03/02/2015 03:02 PM, Mauro Carvalho Chehab wrote:
> Instead of using media_dev argument for dvb_create_media_graph(),
> use the adapter.
>
> That allows to create a stub for this function, if compiled
> without DVB support, avoiding to add extra if's at the drivers.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
>
> diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
> index dd3c1516013f..387db145d37e 100644
> --- a/drivers/media/common/siano/smsdvb-main.c
> +++ b/drivers/media/common/siano/smsdvb-main.c
> @@ -1185,7 +1185,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
> if (smsdvb_debugfs_create(client) < 0)
> pr_info("failed to create debugfs node\n");
>
> - dvb_create_media_graph(coredev->media_dev);
> + dvb_create_media_graph(&client->adapter);
>
> pr_info("DVB interface registered.\n");
> return 0;
> diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
> index 0af9d0c5f889..13bb57f0457f 100644
> --- a/drivers/media/dvb-core/dvbdev.c
> +++ b/drivers/media/dvb-core/dvbdev.c
> @@ -381,9 +381,10 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
> EXPORT_SYMBOL(dvb_unregister_device);
>
>
> -void dvb_create_media_graph(struct media_device *mdev)
> -{
> #ifdef CONFIG_MEDIA_CONTROLLER_DVB
> +void dvb_create_media_graph(struct dvb_adapter *adap)
> +{
> + struct media_device *mdev = adap->mdev;
> struct media_entity *entity, *tuner = NULL, *fe = NULL;
> struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL;
>
> @@ -421,9 +422,9 @@ void dvb_create_media_graph(struct media_device *mdev)
>
> if (demux && ca)
> media_entity_create_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED);
> -#endif
> }
> EXPORT_SYMBOL_GPL(dvb_create_media_graph);
> +#endif
>
> static int dvbdev_check_free_adapter_num(int num)
> {
> diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
> index 467c1311bd4c..caf4d4791a8b 100644
> --- a/drivers/media/dvb-core/dvbdev.h
> +++ b/drivers/media/dvb-core/dvbdev.h
> @@ -122,7 +122,12 @@ extern int dvb_register_device (struct dvb_adapter *adap,
> int type);
>
> extern void dvb_unregister_device (struct dvb_device *dvbdev);
> -void dvb_create_media_graph(struct media_device *mdev);
> +
> +#ifdef CONFIG_MEDIA_CONTROLLER_DVB
> +void dvb_create_media_graph(struct dvb_adapter *adap);
> +#else
> +static inline void dvb_create_media_graph(struct dvb_adapter *adap) {};
Unnecessary trailing ';'.
Regards,
Hans
> +#endif
>
> extern int dvb_generic_open (struct inode *inode, struct file *file);
> extern int dvb_generic_release (struct inode *inode, struct file *file);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
> index 44229a2c2d32..8bf2baae387f 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
> @@ -540,9 +540,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
>
> /* register network adapter */
> dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
> -#ifdef CONFIG_MEDIA_CONTROLLER_DVB
> - dvb_create_media_graph(dev->media_dev);
> -#endif
> + dvb_create_media_graph(&dvb->adapter);
> +
> return 0;
>
> fail_fe_conn:
> diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> index 0666c8f33ac7..08a3cd1c8b44 100644
> --- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> @@ -702,7 +702,7 @@ static int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
> }
> }
>
> - dvb_create_media_graph(adap->dvb_adap.mdev);
> + dvb_create_media_graph(&adap->dvb_adap);
>
> return 0;
>
> diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
> index a7bc4535c58f..6c9f5ecf949c 100644
> --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
> +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
> @@ -320,7 +320,7 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap)
> adap->num_frontends_initialized++;
> }
>
> - dvb_create_media_graph(adap->dvb_adap.mdev);
> + dvb_create_media_graph(&adap->dvb_adap);
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph()
2015-03-02 14:06 ` [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Hans Verkuil
@ 2015-03-02 14:34 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-03-02 14:34 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Antti Palosaari,
Matthias Schwarzott, Hans Verkuil,
Rafael Lourenço de Lima Chehab
Em Mon, 02 Mar 2015 15:06:59 +0100
Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> Hi Mauro,
>
> Small nitpick:
>
> > extern void dvb_unregister_device (struct dvb_device *dvbdev);
> > -void dvb_create_media_graph(struct media_device *mdev);
> > +
> > +#ifdef CONFIG_MEDIA_CONTROLLER_DVB
> > +void dvb_create_media_graph(struct dvb_adapter *adap);
> > +#else
> > +static inline void dvb_create_media_graph(struct dvb_adapter *adap) {};
>
> Unnecessary trailing ';'.
>
> Regards,
>
> Hans
>
Fixed, thanks!
Regards,
Mauro
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-02 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-02 14:02 [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Mauro Carvalho Chehab
2015-03-02 14:02 ` [PATCH 2/2] [media] dvb: Avoid warnings when compiled without the media controller Mauro Carvalho Chehab
2015-03-02 14:06 ` [PATCH 1/2] [media] dvbdev: use adapter arg for dvb_create_media_graph() Hans Verkuil
2015-03-02 14:34 ` Mauro Carvalho Chehab
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.