Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1533624
| From | Shuah Khan <shuahkh@osg.samsung.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 2/3] media: change au0828 to use Media Device Allocator API |
| Date | 2016-11-30 23:10 +0100 |
| Message-ID | <sJleG-3nG-29@gated-at.bofh.it> (permalink) |
| References | <sJleG-3nG-19@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Change au0828 to use Media Device Allocator API to allocate media device
with the parent usb struct device as the key, so it can be shared with the
snd_usb_audio driver.
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
Changes to patch 0002:
- No changes since patch v2, applies cleanly on top of the following:
media: Protect enable_source and disable_source handler code paths
https://lkml.org/lkml/2016/11/29/1001
drivers/media/usb/au0828/au0828-core.c | 12 ++++--------
drivers/media/usb/au0828/au0828.h | 1 +
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index bfd6482..ff1928e 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -159,9 +159,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
dev->media_dev->disable_source = NULL;
mutex_unlock(&mdev->graph_mutex);
- media_device_unregister(dev->media_dev);
- media_device_cleanup(dev->media_dev);
- kfree(dev->media_dev);
+ media_device_delete(dev->media_dev, KBUILD_MODNAME);
dev->media_dev = NULL;
#endif
}
@@ -214,14 +212,10 @@ static int au0828_media_device_init(struct au0828_dev *dev,
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev;
- mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+ mdev = media_device_usb_allocate(udev, KBUILD_MODNAME);
if (!mdev)
return -ENOMEM;
- /* check if media device is already initialized */
- if (!mdev->dev)
- media_device_usb_init(mdev, udev, udev->product);
-
dev->media_dev = mdev;
#endif
return 0;
@@ -482,6 +476,8 @@ static int au0828_media_device_register(struct au0828_dev *dev,
/* register media device */
ret = media_device_register(dev->media_dev);
if (ret) {
+ media_device_delete(dev->media_dev, KBUILD_MODNAME);
+ dev->media_dev = NULL;
dev_err(&udev->dev,
"Media Device Register Error: %d\n", ret);
return ret;
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index dd7b378..4bf1b0c 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -35,6 +35,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-fh.h>
#include <media/media-device.h>
+#include <media/media-dev-allocator.h>
/* DVB */
#include "demux.h"
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 0/3] Media Device Allocator API Shuah Khan <shuahkh@osg.samsung.com> - 2016-11-30 23:10 +0100
[PATCH v6 2/3] media: change au0828 to use Media Device Allocator API Shuah Khan <shuahkh@osg.samsung.com> - 2016-11-30 23:10 +0100
[PATCH v6 1/3] media: Media Device Allocator API Shuah Khan <shuahkh@osg.samsung.com> - 2016-11-30 23:10 +0100
[PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-11-30 23:10 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-05 23:50 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-12-06 00:30 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-06 01:40 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-12-06 14:20 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Sakari Ailus <sakari.ailus@iki.fi> - 2016-12-07 12:00 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-07 21:10 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Sakari Ailus <sakari.ailus@iki.fi> - 2016-12-07 23:30 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-08 15:50 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Sakari Ailus <sakari.ailus@iki.fi> - 2016-12-09 00:50 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Sakari Ailus <sakari.ailus@iki.fi> - 2016-12-09 14:20 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-09 17:50 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Takashi Iwai <tiwai@suse.de> - 2016-12-06 08:20 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Takashi Iwai <tiwai@suse.de> - 2016-12-06 08:00 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-12-06 19:50 +0100
Re: [PATCH v6 3/3] sound/usb: Use Media Controller API to share media resources Takashi Iwai <tiwai@suse.de> - 2016-12-06 20:10 +0100
csiph-web