From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [alsa-devel] [PATCH RFC 1/7] ASoC: tlv320aic26: Add device tree binding Date: Mon, 21 Sep 2015 11:38:28 +0300 Message-ID: <55FFC204.9000903@ti.com> References: <1442607076-26681-1-git-send-email-jcormier@criticallink.com> <1442607076-26681-2-git-send-email-jcormier@criticallink.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1442607076-26681-2-git-send-email-jcormier@criticallink.com> Sender: linux-kernel-owner@vger.kernel.org To: "Cormier, Jonathan" , Liam Girdwood Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Jyri Sarha , Mike Williamson , Greg Gluszek , Misael Lopez Cruz List-Id: alsa-devel@alsa-project.org On 09/18/2015 11:11 PM, Cormier, Jonathan wrote: > diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320= aic26.c > index 620ab9ea1ef0..91fdd96648bd 100644 > --- a/sound/soc/codecs/tlv320aic26.c > +++ b/sound/soc/codecs/tlv320aic26.c > @@ -370,10 +370,20 @@ static int aic26_spi_remove(struct spi_device *= spi) > return 0; > } > =20 > +#if defined(CONFIG_OF) You don't need the #ifdef here > +static const struct of_device_id tlv320aic26_of_match[] =3D { > + { .compatible =3D "ti,tlv320aic26", }, > + {}, > +}; > +#endif > + > static struct spi_driver aic26_spi =3D { > .driver =3D { > .name =3D "tlv320aic26-codec", > .owner =3D THIS_MODULE, > +#if defined(CONFIG_OF) neither here. > + .of_match_table =3D of_match_ptr(tlv320aic26_of_match), > +#endif > }, > .probe =3D aic26_spi_probe, > .remove =3D aic26_spi_remove, >=20 --=20 P=E9ter From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756247AbbIUIim (ORCPT ); Mon, 21 Sep 2015 04:38:42 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:52572 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756009AbbIUIil (ORCPT ); Mon, 21 Sep 2015 04:38:41 -0400 Subject: Re: [alsa-devel] [PATCH RFC 1/7] ASoC: tlv320aic26: Add device tree binding To: "Cormier, Jonathan" , Liam Girdwood References: <1442607076-26681-1-git-send-email-jcormier@criticallink.com> <1442607076-26681-2-git-send-email-jcormier@criticallink.com> CC: , Bob Duke , Mark Brown , , Takashi Iwai , Jyri Sarha , Mike Williamson , Greg Gluszek , Misael Lopez Cruz From: Peter Ujfalusi Message-ID: <55FFC204.9000903@ti.com> Date: Mon, 21 Sep 2015 11:38:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1442607076-26681-2-git-send-email-jcormier@criticallink.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/18/2015 11:11 PM, Cormier, Jonathan wrote: > diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c > index 620ab9ea1ef0..91fdd96648bd 100644 > --- a/sound/soc/codecs/tlv320aic26.c > +++ b/sound/soc/codecs/tlv320aic26.c > @@ -370,10 +370,20 @@ static int aic26_spi_remove(struct spi_device *spi) > return 0; > } > > +#if defined(CONFIG_OF) You don't need the #ifdef here > +static const struct of_device_id tlv320aic26_of_match[] = { > + { .compatible = "ti,tlv320aic26", }, > + {}, > +}; > +#endif > + > static struct spi_driver aic26_spi = { > .driver = { > .name = "tlv320aic26-codec", > .owner = THIS_MODULE, > +#if defined(CONFIG_OF) neither here. > + .of_match_table = of_match_ptr(tlv320aic26_of_match), > +#endif > }, > .probe = aic26_spi_probe, > .remove = aic26_spi_remove, > -- Péter