From: Shuah Khan <shuahkh@osg.samsung.com>
To: mchehab@kernel.org, perex@perex.cz, tiwai@suse.com,
hans.verkuil@cisco.com, javier@osg.samsung.com,
chehabrafael@gmail.com, g.liakhovetski@gmx.de, ONeukum@suse.com,
k@oikw.org, daniel@zonque.org, mahasler@gmail.com,
clemens@ladisch.de, geliangtang@163.com, vdronov@redhat.com,
laurent.pinchart@ideasonboard.com
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
alsa-devel@alsa-project.org, Shuah Khan <shuahkh@osg.samsung.com>
Subject: Re: [PATCH v4 2/3] media: change au0828 to use Media Device Allocator API
Date: Wed, 16 Nov 2016 07:40:23 -0700 [thread overview]
Message-ID: <d44d611d-c74d-5311-f30d-f22af6c10811@osg.samsung.com> (raw)
In-Reply-To: <fdd68ce1fc71dae7504e9e9acd2877dbf970e8c6.1479271294.git.shuahkh@osg.samsung.com>
Sorry for the duplicates. Replying to catch bounced emails on the original
patch emails from git send-email
On 11/16/2016 07:29 AM, Shuah Khan wrote:
> 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 since v2:
> - Updated media_device_delete() to pass in module name.
>
> 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 bf53553..582f31f 100644
> --- a/drivers/media/usb/au0828/au0828-core.c
> +++ b/drivers/media/usb/au0828/au0828-core.c
> @@ -157,9 +157,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
> dev->media_dev->enable_source = NULL;
> dev->media_dev->disable_source = NULL;
>
> - 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
> }
> @@ -212,14 +210,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;
> @@ -487,6 +481,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"
>
next prev parent reply other threads:[~2016-11-16 14:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 14:29 [PATCH v4 0/3] Media Device Allocator API Shuah Khan
2016-11-16 14:29 ` [PATCH v4 1/3] media: " Shuah Khan
2016-11-16 14:39 ` Shuah Khan
2016-11-17 23:12 ` Sakari Ailus
2016-11-18 1:50 ` Shuah Khan
2016-11-16 14:29 ` [PATCH v4 2/3] media: change au0828 to use " Shuah Khan
2016-11-16 14:40 ` Shuah Khan [this message]
2016-11-25 9:25 ` Mauro Carvalho Chehab
2016-11-16 14:29 ` [PATCH v4 3/3] sound/usb: Use Media Controller API to share media resources Shuah Khan
2016-11-16 14:40 ` Shuah Khan
2016-11-25 9:39 ` Mauro Carvalho Chehab
2016-11-16 14:39 ` [PATCH v4 0/3] Media Device Allocator API Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d44d611d-c74d-5311-f30d-f22af6c10811@osg.samsung.com \
--to=shuahkh@osg.samsung.com \
--cc=ONeukum@suse.com \
--cc=alsa-devel@alsa-project.org \
--cc=chehabrafael@gmail.com \
--cc=clemens@ladisch.de \
--cc=daniel@zonque.org \
--cc=g.liakhovetski@gmx.de \
--cc=geliangtang@163.com \
--cc=hans.verkuil@cisco.com \
--cc=javier@osg.samsung.com \
--cc=k@oikw.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mahasler@gmail.com \
--cc=mchehab@kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=vdronov@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).