From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756337Ab1CVPvZ (ORCPT ); Tue, 22 Mar 2011 11:51:25 -0400 Received: from cantor.suse.de ([195.135.220.2]:45644 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733Ab1CVPvX (ORCPT ); Tue, 22 Mar 2011 11:51:23 -0400 Date: Tue, 22 Mar 2011 16:51:21 +0100 Message-ID: From: Takashi Iwai To: Randy Dunlap Cc: Mark Brown , Ingo Molnar , Linus Torvalds , Jaroslav Kysela , Liam Girdwood , Andrew Morton , linux-kernel@vger.kernel.org, Zeng Zhaoming Subject: Re: [build failure] Re: [GIT PULL] sound updates for 2.6.39-rc1 In-Reply-To: <20110322083839.caab0520.randy.dunlap@oracle.com> References: <20110321153719.GA12325@elte.hu> <20110321155836.GE2570@opensource.wolfsonmicro.com> <20110321161102.GB23614@elte.hu> <20110321163849.GF2570@opensource.wolfsonmicro.com> <20110321164937.GA6381@elte.hu> <20110321165827.GG2570@opensource.wolfsonmicro.com> <20110322122436.GA6834@opensource.wolfsonmicro.com> <20110322083839.caab0520.randy.dunlap@oracle.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (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: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 22 Mar 2011 08:38:39 -0700, Randy Dunlap wrote: > > On Tue, 22 Mar 2011 12:24:36 +0000 Mark Brown wrote: > > > On Mon, Mar 21, 2011 at 04:58:27PM +0000, Mark Brown wrote: > > > That's the breakage, yes. It should be very straightforward to make the > > > driver build no matter how CONFIG_REGULATOR is set. > > > > And indeed it was - in the absence of any response from Zeng I've now > > sent a patch for review. > > -- > > Hi, > Where was the patch sent, please? alsa-devel ML. Attached below. Takashi === From: Mark Brown Subject: [alsa-devel] [PATCH] ASoC: Support !REGULATOR build for sgtl5000 The regulator is optional depending on board design. Signed-off-by: Mark Brown --- sound/soc/codecs/sgtl5000.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 1f7217f..ff29380 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } +#ifdef CONFIG_REGULATOR static int ldo_regulator_is_enabled(struct regulator_dev *dev) { struct ldo_regulator *ldo = rdev_get_drvdata(dev); @@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec) return 0; } +#else +static int ldo_regulator_register(struct snd_soc_codec *codec, + struct regulator_init_data *init_data, + int voltage) +{ + return -EINVAL; +} + +static int ldo_regulator_remove(struct snd_soc_codec *codec) +{ + return 0; +} +#endif /* * set dac bias -- 1.7.4.1