From patchwork Thu Jun 25 13:44:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 6675231 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 3DD999F380 for ; Thu, 25 Jun 2015 13:44:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13715206E8 for ; Thu, 25 Jun 2015 13:44:35 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D1BA720630 for ; Thu, 25 Jun 2015 13:44:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id BE35226060F; Thu, 25 Jun 2015 15:44:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 7122F26058A; Thu, 25 Jun 2015 15:44:30 +0200 (CEST) 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 5A5B0260593; Thu, 25 Jun 2015 15:44:28 +0200 (CEST) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by alsa0.perex.cz (Postfix) with ESMTP id F3470260577 for ; Thu, 25 Jun 2015 15:44:20 +0200 (CEST) Received: by pdbep18 with SMTP id ep18so32042693pdb.1 for ; Thu, 25 Jun 2015 06:44:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; bh=4Z9/i7jcRudFrt87N5oBux2QyPsGbKI3Q2ZX4/ZZzak=; b=JPI1n/CdPAi1brTz+4Ly41F/++RRUVujAP7WDPGiG4yvW88QXAPhkXdgCIsTVB3tKp 4T3I46WZ3dYPsXUVHN61GnqZHxujfpSlhOoHRptuzRxabT5KiVHKqJsH6/q16z4iJRAH ubkMjZ5NlMhWZH8PP6rSQSky7ySuOaGgJzwm4KqVDghdrEaLz8105kqBPIZcUtWMU8IZ /K7guLQg3OmzpRbAalgcTgT+dB6KNOSe50uydNBkznnUHEGmbhk6KxgDnUCVAE+7dO3D ubuhNga4I1pGDacQ9H5o0ZJ2UqQ587sllytSJwlSEcwr+VAGFnHCHemWEdtlNBkq+QiF oT1w== X-Gm-Message-State: ALoCoQmCiz4BLgUrkZ6kZsms67/RkrWulYNKU4gcBaI2mjFNPealljIq9SqxJ2+ENhrx3k+F2/J+ X-Received: by 10.67.3.3 with SMTP id bs3mr91320577pad.51.1435239859606; Thu, 25 Jun 2015 06:44:19 -0700 (PDT) Received: from phoenix.local (36-239-240-88.dynamic-ip.hinet.net. [36.239.240.88]) by mx.google.com with ESMTPSA id gs7sm30157211pbc.6.2015.06.25.06.44.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2015 06:44:18 -0700 (PDT) Message-ID: <1435239853.22170.4.camel@ingics.com> From: Axel Lin To: Mark Brown Date: Thu, 25 Jun 2015 21:44:13 +0800 In-Reply-To: <1435239703.22170.1.camel@ingics.com> References: <1435239703.22170.1.camel@ingics.com> X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Cc: Brian Austin , alsa-devel@alsa-project.org, Liam Girdwood , Paul Handrigan Subject: [alsa-devel] [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table 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 Setup of_match_table and since cs42xx8_of_match is exported and used in cs42xx8-i2c.c, it cannot be static. Signed-off-by: Axel Lin Acked-by: Brian Austin --- sound/soc/codecs/cs42xx8-i2c.c | 3 ++- sound/soc/codecs/cs42xx8.c | 2 +- sound/soc/codecs/cs42xx8.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index 657dce2..5a71c9e 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -20,7 +20,7 @@ static int cs42xx8_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { - u32 ret = cs42xx8_probe(&i2c->dev, + int ret = cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config)); if (ret) return ret; @@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = { .name = "cs42xx8", .owner = THIS_MODULE, .pm = &cs42xx8_pm, + .of_match_table = cs42xx8_of_match, }, .probe = cs42xx8_i2c_probe, .remove = cs42xx8_i2c_remove, diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index ab39514..d562e1b 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = { }; EXPORT_SYMBOL_GPL(cs42888_data); -static const struct of_device_id cs42xx8_of_match[] = { +const struct of_device_id cs42xx8_of_match[] = { { .compatible = "cirrus,cs42448", .data = &cs42448_data, }, { .compatible = "cirrus,cs42888", .data = &cs42888_data, }, { /* sentinel */ } diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h index b2c10e5..d36c61b 100644 --- a/sound/soc/codecs/cs42xx8.h +++ b/sound/soc/codecs/cs42xx8.h @@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm; extern const struct cs42xx8_driver_data cs42448_data; extern const struct cs42xx8_driver_data cs42888_data; extern const struct regmap_config cs42xx8_regmap_config; +extern const struct of_device_id cs42xx8_of_match[]; int cs42xx8_probe(struct device *dev, struct regmap *regmap); /* CS42888 register map */