From patchwork Wed Jan 22 12:00:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 23516 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 07D5C203C6 for ; Wed, 22 Jan 2014 12:05:33 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g12sf1046602oah.2 for ; Wed, 22 Jan 2014 04:05:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=BMN3n22gU6y3mJ8dTNHum8wahT7v5l0BxYAX7tyO5jE=; b=MLwgZTDeX+dNc+iGVsE1HMpCszYaMmpSEQapZ4gkFnoBzKSkws/IP9sOne818gbCNI 8dPlwlaXuYZV/EizVysHM2Vx6vDXCGhQjRbfXHFkiO1LFx/SYSFTRW+/yOhJeCbDBo3Y 4cI8lna4cuDLvQrM/KKUaATtV6WKcGImhy8MtgWNWYd+DYji7o259qip+oMrTzZYMI3G yOjbL+OdK0773qtX5nlLuNV7Uezj9l3vPP7t83OwDZqddjauafCsEc4H97Q3blS7uZCm 1meoHXRfP1oTMqa0VFLUy6CZ4+NfEyj8vsIfO918F2pnJQU+eprkgEoQ4BKOpvEzhX/E 26jQ== X-Gm-Message-State: ALoCoQnAYzHQUX1rQmZK3iTpJXNjcyy6SVKf0CUt0eOr0LUNNniXe3yZK6vScVEhip01XDAalIJQ X-Received: by 10.182.186.73 with SMTP id fi9mr410123obc.48.1390392333147; Wed, 22 Jan 2014 04:05:33 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.41 with SMTP id f38ls45718qge.55.gmail; Wed, 22 Jan 2014 04:05:33 -0800 (PST) X-Received: by 10.220.76.201 with SMTP id d9mr603079vck.33.1390392333051; Wed, 22 Jan 2014 04:05:33 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id ry8si4404399vcb.121.2014.01.22.04.05.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 04:05:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id cz12so163317veb.29 for ; Wed, 22 Jan 2014 04:05:33 -0800 (PST) X-Received: by 10.58.6.239 with SMTP id e15mr654675vea.14.1390392332986; Wed, 22 Jan 2014 04:05:32 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp179961vcz; Wed, 22 Jan 2014 04:05:32 -0800 (PST) X-Received: by 10.67.5.233 with SMTP id cp9mr1061693pad.147.1390392332153; Wed, 22 Jan 2014 04:05:32 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id p3si9620035pbj.98.2014.01.22.04.05.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 04:05:32 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.42; Received: by mail-pa0-f42.google.com with SMTP id kl14so299627pab.15 for ; Wed, 22 Jan 2014 04:05:31 -0800 (PST) X-Received: by 10.68.138.226 with SMTP id qt2mr1140070pbb.65.1390392331696; Wed, 22 Jan 2014 04:05:31 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id db3sm22297385pbb.10.2014.01.22.04.05.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 04:05:31 -0800 (PST) From: Sachin Kamat To: alsa-devel@alsa-project.org Cc: sbkim73@samsung.com, lgirdwood@gmail.com, broonie@kernel.org, tiwai@suse.de, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH v2 6/6] ASoC: Samsung: smdk_wm8994: Fix build error Date: Wed, 22 Jan 2014 17:30:43 +0530 Message-Id: <1390392043-24387-7-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390392043-24387-1-git-send-email-sachin.kamat@linaro.org> References: <1390392043-24387-1-git-send-email-sachin.kamat@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Fixes the following build error and warning when OF is not defined: sound/soc/samsung/smdk_wm8994.c:191:23: error: ‘samsung_wm8994_of_match’ undeclared (first use in this function) sound/soc/samsung/smdk_wm8994.c:47:32: warning: ‘smdk_board_data’ defined but not used [-Wunused-variable] of_match_ptr() is used so that samsung_wm8994_of_match gets dropped (as unused) by the compiler when OF is not defined. Signed-off-by: Sachin Kamat --- sound/soc/samsung/smdk_wm8994.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index b072bd107b31..d38ae98e2f32 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -152,13 +152,11 @@ static struct snd_soc_card smdk = { .num_links = ARRAY_SIZE(smdk_dai), }; -#ifdef CONFIG_OF static const struct of_device_id samsung_wm8994_of_match[] = { { .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data }, {}, }; MODULE_DEVICE_TABLE(of, samsung_wm8994_of_match); -#endif /* CONFIG_OF */ static int smdk_audio_probe(struct platform_device *pdev) { @@ -188,7 +186,7 @@ static int smdk_audio_probe(struct platform_device *pdev) smdk_dai[0].platform_of_node = smdk_dai[0].cpu_of_node; } - id = of_match_device(samsung_wm8994_of_match, &pdev->dev); + id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev); if (id) *board = *((struct smdk_wm8994_data *)id->data);