From patchwork Mon Dec 7 12:34:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 7783381 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B6EC9F39B for ; Mon, 7 Dec 2015 12:34:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1823A2038A for ; Mon, 7 Dec 2015 12:34:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id BC165200E3 for ; Mon, 7 Dec 2015 12:34:47 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 78225265A17; Mon, 7 Dec 2015 13:34:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id ECDDB265512; Mon, 7 Dec 2015 13:34:39 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CB8732658A7; Mon, 7 Dec 2015 13:34:36 +0100 (CET) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by alsa0.perex.cz (Postfix) with ESMTP id 9B1A12625D7 for ; Mon, 7 Dec 2015 13:34:31 +0100 (CET) Received: by lbbkw15 with SMTP id kw15so60546336lbb.0 for ; Mon, 07 Dec 2015 04:34:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=csl5FBkUAludRKyY6g54rmQZyp1pGnGeDS0Vq4U+01I=; b=RBA7NNZ1IFNBEnO2n0/GV3gsGdRWR0A7FySBFM4f81Sdfa61wZZ3lD4jVupWquB2h1 m8Lg0ZD+0RF8pZRBvCFCFVBiSuYCl9bMxsmXzWxMeO1ipwhEFinblpOEXUxsFJL7edNy oa2p/bwN+rmGq68B1JX6fgSkKLjC0UcZ/WReKNR1aYlEsyWLKDwOvctA3HfxbFr6Cp0D DMiWHXC0q7i0zqmd+2S/DzUtGMC8T68B/mc2aYfH+2+cAgmtnlHmNoKw65druBkKXBXi ZSaRBoK1kak40XLl4LF3sj4MmnLkHcw7ImqWbdTrJxA4PJq5Oof66BJyPT12XZwAtmDR GG3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=csl5FBkUAludRKyY6g54rmQZyp1pGnGeDS0Vq4U+01I=; b=Hhdh3ek77ISeZ55jxREaMsN2e0Od4ly/eJEIcMcIoubpcSsnGYgfQEuEReivpycwxK phSNhiQinksMDv5YTZK0fSo2Fts1ithrlbzAk/G+sffwHfV7ZV+aCpbB4nTmip83aWAs geXVd74e+ocsoiaCqCw7wOMxLa8yjd+UAhzGv+BW+8n82ZmYYJCaMKt2JoGuQz0wu8qV 22h8GmVh4XqMwMdptsTW2jDntKQMq42bH7bCoRt2Q4NIL1bO3wLeiMNG48WjghbUvcsW zEycVhaS/2Oa3lHgT3UuzGvdugX+9lkxVmX/qXLNVfNFxhKrkpW5NdklrqM8XIvDB5Kq UD8A== X-Gm-Message-State: ALoCoQkwPPn6OY6upVK1jwFTn4gowQDdWWtMPl/M25C2UVPpKUKoQg8rP88ewgXaN3xeiUX5wnQN MIME-Version: 1.0 X-Received: by 10.25.137.84 with SMTP id l81mr13603276lfd.45.1449491671096; Mon, 07 Dec 2015 04:34:31 -0800 (PST) Received: by 10.25.76.9 with HTTP; Mon, 7 Dec 2015 04:34:31 -0800 (PST) In-Reply-To: <20151203001214.GP1929@sirena.org.uk> References: <20151203001214.GP1929@sirena.org.uk> Date: Mon, 7 Dec 2015 13:34:31 +0100 Message-ID: From: Linus Walleij To: Mark Brown Cc: "linux-gpio@vger.kernel.org" , "alsa-devel@alsa-project.org" , Liam Girdwood Subject: Re: [alsa-devel] [GIT PULL] AC'97 gpiochip X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Dec 3, 2015 at 1:12 AM, Mark Brown wrote: > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec: > > Linux 4.4-rc1 (2015-11-15 17:00:27 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-ac97-gpio > > for you to fetch changes up to 9bf5c3d11f1fbaf43399d189f05fb20ceb46ee5d: > > ASoC: ac97: add gpio chip (2015-11-18 18:08:54 +0000) > > ---------------------------------------------------------------- > ASoC: Add a GPIO chip for AC'97 Pulled to the GPIO devel branch, then I immediately applied this on top: From a1eb9d5751220433998ae2e66216288161b1355b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 7 Dec 2015 13:32:28 +0100 Subject: [PATCH] ASoC: ac97: fix parent assignment Upstream GPIO has substituted .dev for .parent in struct gpio_chip. Signed-off-by: Linus Walleij --- sound/soc/soc-ac97.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c index ae563e379a72..a2012652f212 100644 --- a/sound/soc/soc-ac97.c +++ b/sound/soc/soc-ac97.c @@ -142,7 +142,7 @@ static int snd_soc_ac97_init_gpio(struct snd_ac97 *ac97, gpio_priv->codec = codec; gpio_priv->gpio_chip = snd_soc_ac97_gpio_chip; gpio_priv->gpio_chip.ngpio = AC97_NUM_GPIOS; - gpio_priv->gpio_chip.dev = codec->dev; + gpio_priv->gpio_chip.parent = codec->dev; gpio_priv->gpio_chip.base = -1; ret = gpiochip_add(&gpio_priv->gpio_chip);