[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160204080500.5c5eaa90@recife.lan>
Date: Thu, 4 Feb 2016 08:05:00 -0200
From: Mauro Carvalho Chehab <mchehab@....samsung.com>
To: Shuah Khan <shuahkh@....samsung.com>
Cc: tiwai@...e.com, clemens@...isch.de, hans.verkuil@...co.com,
laurent.pinchart@...asonboard.com, sakari.ailus@...ux.intel.com,
javier@....samsung.com, pawel@...iak.com, m.szyprowski@...sung.com,
kyungmin.park@...sung.com, perex@...ex.cz, arnd@...db.de,
dan.carpenter@...cle.com, tvboxspy@...il.com, crope@....fi,
ruchandani.tina@...il.com, corbet@....net, chehabrafael@...il.com,
k.kozlowski@...sung.com, stefanr@...6.in-berlin.de,
inki.dae@...sung.com, jh1009.sung@...sung.com,
elfring@...rs.sourceforge.net, prabhakar.csengg@...il.com,
sw0312.kim@...sung.com, p.zabel@...gutronix.de,
ricardo.ribalda@...il.com, labbott@...oraproject.org,
pierre-louis.bossart@...ux.intel.com, ricard.wanderlof@...s.com,
julian@...st.de, takamichiho@...il.com, dominic.sacre@....de,
misterpib@...il.com, daniel@...que.org, gtmkramer@...all.nl,
normalperson@...t.net, joe@...po.co.uk, linuxbugs@...tgam.net,
johan@...ud.se, klock.android@...il.com, nenggun.kim@...sung.com,
j.anaszewski@...sung.com, geliangtang@....com,
linux-kernel@...r.kernel.org, linux-media@...r.kernel.org,
linux-api@...r.kernel.org, alsa-devel@...a-project.org
Subject: Re: [PATCH v2 14/22] media: au0828 change to use Managed Media
Controller API
Em Wed, 03 Feb 2016 21:03:46 -0700
Shuah Khan <shuahkh@....samsung.com> escreveu:
> Change au0828 to use Managed Media Controller API to
> share media device and coordinate creating/deleting
> the shared media device with the snd-usb-audio driver.
> The shared media device is created as device resource
> of the parent usb device of the two drivers.
>
> Signed-off-by: Shuah Khan <shuahkh@....samsung.com>
> ---
> drivers/media/usb/au0828/au0828-core.c | 29 +++++++++++++++--------------
> 1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
> index df2bc3f..b8c4bdd 100644
> --- a/drivers/media/usb/au0828/au0828-core.c
> +++ b/drivers/media/usb/au0828/au0828-core.c
> @@ -134,10 +134,10 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
> {
>
> #ifdef CONFIG_MEDIA_CONTROLLER
> - if (dev->media_dev) {
> + if (dev->media_dev &&
> + media_devnode_is_registered(&dev->media_dev->devnode)) {
> media_device_unregister(dev->media_dev);
> media_device_cleanup(dev->media_dev);
> - kfree(dev->media_dev);
> dev->media_dev = NULL;
> }
> #endif
> @@ -223,23 +223,24 @@ 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_get_devres(&udev->dev);
> if (!mdev)
> return -ENOMEM;
>
> - mdev->dev = &udev->dev;
> + if (!media_devnode_is_registered(&mdev->devnode)) {
> + mdev->dev = &udev->dev;
>
> - if (!dev->board.name)
> - strlcpy(mdev->model, "unknown au0828", sizeof(mdev->model));
> - else
> - strlcpy(mdev->model, dev->board.name, sizeof(mdev->model));
> - if (udev->serial)
> - strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
> - strcpy(mdev->bus_info, udev->devpath);
> - mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
> - mdev->driver_version = LINUX_VERSION_CODE;
> + if (udev->product)
> + strlcpy(mdev->model, udev->product,
> + sizeof(mdev->model));
Why did you change that? On some boards, udev->product doesn't reflect
the brand name, but have just some random generic data.
Also, as the other logs associated with the device uses dev->board.name,
we want the media controller to use the same name here. Ok, if this
is null, we could use udev->product as a replacement.
> + if (udev->serial)
> + strlcpy(mdev->serial, udev->serial,
> + sizeof(mdev->serial));
> + strcpy(mdev->bus_info, udev->devpath);
> + mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
>
> - media_device_init(mdev);
> + media_device_init(mdev);
> + }
>
> dev->media_dev = mdev;
> #endif
Powered by blists - more mailing lists