From patchwork Tue Aug 30 11:39:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1112872 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7UBeahe017440 for ; Tue, 30 Aug 2011 11:40:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543Ab1H3LkL (ORCPT ); Tue, 30 Aug 2011 07:40:11 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:39277 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753539Ab1H3LkG (ORCPT ); Tue, 30 Aug 2011 07:40:06 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p7UBdoqC013932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 30 Aug 2011 06:39:50 -0500 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7UBdolL017218; Tue, 30 Aug 2011 06:39:50 -0500 (CDT) Received: from DLEE74.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7UBdoV9015447; Tue, 30 Aug 2011 06:39:50 -0500 (CDT) Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Tue, 30 Aug 2011 06:39:50 -0500 Received: from barack.norway.design.ti.com (h88-1.vpn.ti.com [172.24.88.1]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7UBdegr016622; Tue, 30 Aug 2011 06:39:48 -0500 From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren CC: , , Jarkko Nikula Subject: [PATCH 3/3] ASoC: tpa6130a2: Remove model_id from platform data Date: Tue, 30 Aug 2011 14:39:54 +0300 Message-ID: <1314704394-31298-4-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1314704394-31298-1-git-send-email-peter.ujfalusi@ti.com> References: <1314704394-31298-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Aug 2011 11:40:52 +0000 (UTC) The model_id is no longer needed within the platform_data for the TPA driver since the model of TPA specified with the device name (tpa6130a2/tpa6140a2). Signed-off-by: Peter Ujfalusi --- include/sound/tpa6130a2-plat.h | 6 ------ sound/soc/codecs/tpa6130a2.c | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h index 89beccb..4cc1093 100644 --- a/include/sound/tpa6130a2-plat.h +++ b/include/sound/tpa6130a2-plat.h @@ -23,13 +23,7 @@ #ifndef TPA6130A2_PLAT_H #define TPA6130A2_PLAT_H -enum tpa_model { - TPA6130A2, - TPA6140A2, -}; - struct tpa6130a2_platform_data { - enum tpa_model id; int power_gpio; }; diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index 0c0fcb3..f37a02b 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c @@ -33,6 +33,11 @@ #include "tpa6130a2.h" +enum tpa_model { + TPA6130A2, + TPA6140A2, +}; + static struct i2c_client *tpa6130a2_client; /* This struct is used to save the context */