From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1423120AbcBZTkv (ORCPT <rfc822;w@1wt.eu>);
	Fri, 26 Feb 2016 14:40:51 -0500
Received: from mx2.suse.de ([195.135.220.15]:60673 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754849AbcBZTku (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 26 Feb 2016 14:40:50 -0500
Date: Fri, 26 Feb 2016 20:40:48 +0100
Message-ID: <s5hr3fzjm4f.wl-tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: "Mauro Carvalho Chehab" <mchehab@osg.samsung.com>
Cc: "Shuah Khan" <shuahkh@osg.samsung.com>, <geliangtang@163.com>,
        <alsa-devel@alsa-project.org>, <arnd@arndb.de>,
        <ricard.wanderlof@axis.com>, <hans.verkuil@cisco.com>,
        <labbott@fedoraproject.org>, <chehabrafael@gmail.com>,
        <klock.android@gmail.com>, <misterpib@gmail.com>,
        <prabhakar.csengg@gmail.com>, <ricardo.ribalda@gmail.com>,
        <ruchandani.tina@gmail.com>, <takamichiho@gmail.com>,
        <tvboxspy@gmail.com>, <dominic.sacre@gmx.de>, <albert@huitsing.nl>,
        <laurent.pinchart@ideasonboard.com>, <crope@iki.fi>, <julian@jusst.de>,
        <clemens@ladisch.de>, <pierre-louis.bossart@linux.intel.com>,
        <sakari.ailus@linux.intel.com>, <corbet@lwn.net>, <joe@oampo.co.uk>,
        <johan@oljud.se>, <dan.carpenter@oracle.com>, <pawel@osciak.com>,
        <javier@osg.samsung.com>, <p.zabel@pengutronix.de>, <perex@perex.cz>,
        <stefanr@s5r6.in-berlin.de>, <inki.dae@samsung.com>,
        <j.anaszewski@samsung.com>, <jh1009.sung@samsung.com>,
        <k.kozlowski@samsung.com>, <kyungmin.park@samsung.com>,
        <m.szyprowski@samsung.com>, <nenggun.kim@samsung.com>,
        <sw0312.kim@samsung.com>, <elfring@users.sourceforge.net>,
        <linux-kernel@vger.kernel.org>, <linux-media@vger.kernel.org>,
        <linuxbugs@vittgam.net>, <gtmkramer@xs4all.nl>,
        <normalperson@yhbt.net>, <daniel@zonque.org>
Subject: Re: [PATCH v3 04/22] media: Add ALSA Media Controller function entities
In-Reply-To: <20160217102505.200675ac@recife.lan>
References: <cover.1455233150.git.shuahkh@osg.samsung.com>
	<423baaaf7ae51eb9098b7d0adc5ad668a590449e.1455233153.git.shuahkh@osg.samsung.com>
	<20160217102505.200675ac@recife.lan>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 17 Feb 2016 13:25:05 +0100,
Mauro Carvalho Chehab wrote:
> 
> Em Thu, 11 Feb 2016 16:41:20 -0700
> Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> 
> > Add ALSA Media Controller capture, playback, and mixer
> > function entity defines.
> > 
> > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> > ---
> >  include/uapi/linux/media.h | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> > index 3cc0366..449462e 100644
> > --- a/include/uapi/linux/media.h
> > +++ b/include/uapi/linux/media.h
> > @@ -98,6 +98,13 @@ struct media_device_info {
> >  #define MEDIA_ENT_F_IF_AUD_DECODER	(MEDIA_ENT_F_BASE + 42)
> >  
> >  /*
> > + * Audio Entity Functions
> > + */
> > +#define MEDIA_ENT_F_AUDIO_CAPTURE	(MEDIA_ENT_F_BASE + 200)
> > +#define MEDIA_ENT_F_AUDIO_PLAYBACK	(MEDIA_ENT_F_BASE + 201)
> > +#define MEDIA_ENT_F_AUDIO_MIXER		(MEDIA_ENT_F_BASE + 202)
> > +
> > +/*
> >   * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
> >   * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility
> >   * with the legacy v1 API.The number range is out of range by purpose:
> 
> Looks OK to me. 
> 
> This won't apply anymore on master, because we changed the numberspace, 
> but it is a trivial conflict. No need to rebase.
> 
> Takashi,
> 
> If OK for you, please ack.

Acked-by: Takashi Iwai <tiwai@suse.de>


Takashi