From patchwork Tue Jun 9 13:34:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 6572661 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@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 9906B9F326 for ; Tue, 9 Jun 2015 13:35:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9C7520437 for ; Tue, 9 Jun 2015 13:35:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C239C20439 for ; Tue, 9 Jun 2015 13:35:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753631AbbFINfL (ORCPT ); Tue, 9 Jun 2015 09:35:11 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:38104 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbbFINfK (ORCPT ); Tue, 9 Jun 2015 09:35:10 -0400 Received: by wibdq8 with SMTP id dq8so17112743wib.1 for ; Tue, 09 Jun 2015 06:35:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UlxHSqMYJDJ2xDNPzcLlGi0Hqs757UOopVwaSRVLy3M=; b=JfBopGd98dHAjYCLKOjmehywRP+bLWqGLWm4vJE65aJWLt9VIYLv/gOzhrSZE5VByZ UDNlHtnPO4qqqKRQQ3YGA0hbeO9w0gvgLSEJOkDXl0nf+wqdL2Sv43wwiyA61nx5ZIRO lMc332dptVeQRSierLhC2yyAILzWDEUcGdEDk+GyxqVIQIW78d6sho5qEZy6LE5hkwOB qdyytwHEJL5w23dsJ9tJoQ0BlZJFHE9V1TvUjCSK2KAgKR+2odX/HW1F8h/m5ICt2kSx Cx/13aHOwctUcXSS915evkb2vShILkuyusEIbSWvuIw4CPLFXCnxAEISFHtHwcSOas7z vvhg== X-Gm-Message-State: ALoCoQnnG4Rq5YRUjePLyiMk1EyjP5c2AsxO9dheGx8nuGg6Z9mhVGv0j11gaW6Y/BAeJMCnzp05 X-Received: by 10.180.104.167 with SMTP id gf7mr8600310wib.3.1433856908902; Tue, 09 Jun 2015 06:35:08 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-99-231-135.as13285.net. [2.99.231.135]) by mx.google.com with ESMTPSA id u9sm9494335wju.44.2015.06.09.06.35.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 06:35:07 -0700 (PDT) From: Srinivas Kandagatla To: Patrick Lai , Mark Brown , kwestfie@codeaurora.org Cc: Rob Herring , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 1/2] ASoC: qcom: storm: allocate snd_soc_card struct dynamically. Date: Tue, 9 Jun 2015 14:34:21 +0100 Message-Id: <1433856861-15433-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch moves static allocation of snd_soc_card to dynamic allocation, the reason to do this is to avoid holding up any dangling pointers in this static structures. And I see no use for having this struct as static given that the card->name is also populated dynamically from dt. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/storm.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c index b8bd296..ee06613 100644 --- a/sound/soc/qcom/storm.c +++ b/sound/soc/qcom/storm.c @@ -69,11 +69,6 @@ static struct snd_soc_dai_link storm_dai_link = { .ops = &storm_soc_ops, }; -static struct snd_soc_card storm_soc_card = { - .name = "ipq806x-storm", - .dev = NULL, -}; - static int storm_parse_of(struct snd_soc_card *card) { struct snd_soc_dai_link *dai_link = card->dai_link; @@ -99,14 +94,13 @@ static int storm_parse_of(struct snd_soc_card *card) static int storm_platform_probe(struct platform_device *pdev) { - struct snd_soc_card *card = &storm_soc_card; + struct snd_soc_card *card; int ret; - if (card->dev) { - dev_err(&pdev->dev, "%s() error, existing soundcard\n", - __func__); - return -ENODEV; - } + card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL); + if (!card) + return -ENOMEM; + card->dev = &pdev->dev; platform_set_drvdata(pdev, card); @@ -129,7 +123,6 @@ static int storm_platform_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret == -EPROBE_DEFER) { - card->dev = NULL; return ret; } else if (ret) { dev_err(&pdev->dev, "%s() error registering soundcard: %d\n",