From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754190AbcKYJZZ (ORCPT ); Fri, 25 Nov 2016 04:25:25 -0500 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:58404 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753342AbcKYJZQ (ORCPT ); Fri, 25 Nov 2016 04:25:16 -0500 Date: Fri, 25 Nov 2016 07:25:07 -0200 From: Mauro Carvalho Chehab To: Shuah Khan Cc: 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, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: Re: [PATCH v4 2/3] media: change au0828 to use Media Device Allocator API Message-ID: <20161125072507.65d0a14f@vento.lan> In-Reply-To: References: Organization: Samsung X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, 16 Nov 2016 07:29:10 -0700 Shuah Khan escreveu: > 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 I missed a v5 for this patch. This one looks OK. If you don't change this anymore, please add on the v6: Reviewed-by: Mauro Carvalho Chehab > --- > 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 > #include > #include > +#include > > /* DVB */ > #include "demux.h" Thanks, Mauro