From patchwork Mon Sep 29 19:39:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Kristiansson X-Patchwork-Id: 5001071 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 041509F3DF for ; Tue, 30 Sep 2014 08:37:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39A682011D for ; Tue, 30 Sep 2014 08:37:05 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5F1E3200FF for ; Tue, 30 Sep 2014 08:37:03 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 72F462608EA; Tue, 30 Sep 2014 10:37:02 +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 0A0FE2604F0; Tue, 30 Sep 2014 10:33:54 +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 D836F26069D; Mon, 29 Sep 2014 21:42:07 +0200 (CEST) Received: from smtp.nebula.fi (smtp-69.nebula.fi [83.145.220.69]) by alsa0.perex.cz (Postfix) with ESMTP id BBB59260692 for ; Mon, 29 Sep 2014 21:41:56 +0200 (CEST) Received: from wonka.TeleWell.gateway (nblzone-224-141.nblnetworks.fi [83.145.224.141]) by smtp.nebula.fi (Postfix) with ESMTP id 8A403D005A9; Mon, 29 Sep 2014 22:41:50 +0300 (EEST) From: Stefan Kristiansson To: linux-kernel@vger.kernel.org Date: Mon, 29 Sep 2014 22:39:13 +0300 Message-Id: <1412019553-19342-1-git-send-email-stefan.kristiansson@saunalahti.fi> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Tue, 30 Sep 2014 10:33:49 +0200 Cc: alsa-devel@alsa-project.org, broonie@kernel.org, lgirdwood@gmail.com, lars@metafoo.de, Stefan Kristiansson Subject: [alsa-devel] [PATCH v2 1/3] ASoC: ssm2602: do not hardcode type to SSM2602 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The correct type (SSM2602/SSM2603/SSM2604) is passed down from the ssm2602_spi_probe()/ssm2602_spi_probe() functions, so use that instead of hardcoding it to SSM2602 in ssm2602_probe(). Signed-off-by: Stefan Kristiansson --- Changes in v2: - None, new in series. --- sound/soc/codecs/ssm2602.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 484b3bb..4021cd4 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -647,7 +647,7 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type, return -ENOMEM; dev_set_drvdata(dev, ssm2602); - ssm2602->type = SSM2602; + ssm2602->type = type; ssm2602->regmap = regmap; return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602,