From patchwork Fri Aug 30 07:42:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tzung-Bi Shih X-Patchwork-Id: 11123207 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 205D814D5 for ; Fri, 30 Aug 2019 07:45:56 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A733822CE9 for ; Fri, 30 Aug 2019 07:45:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="pa4ts/9F"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="T/dPKkb/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A733822CE9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DE5871664; Fri, 30 Aug 2019 09:45:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DE5871664 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1567151154; bh=v9YQqnrJO2O0RJkr8dg9Qf8uQJb8SG1rJ9rVZg+Lxfo=; h=Date:In-Reply-To:References:From:To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pa4ts/9F0Iy7Z1mc7Y7Sn9OM4emne3gt687lxWKtfht40qeaYsoNmwArsMg9zkn4y ia9i1eSgBXC0osNxK0pl/LJyvkliZVed33qu3DKh02xHJbaFwXk9yP0DbiDdmEz2wZ LeoNIVOhlTQJbbqdtypW3deV8gO0DUHG97gY+ErI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 35C89F805F7; Fri, 30 Aug 2019 09:43:07 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id C3C1DF805F9; Fri, 30 Aug 2019 09:43:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=disabled version=3.4.0 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 291ADF805F7 for ; Fri, 30 Aug 2019 09:43:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 291ADF805F7 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="T/dPKkb/" Received: by mail-qk1-x74a.google.com with SMTP id y188so6327713qke.18 for ; Fri, 30 Aug 2019 00:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=sQAvSFliNRzsihBO4D3II/hLNdzvUKs4D9QWENz0aT8=; b=T/dPKkb/qUAnqls4DkHU3SWROP0nWhRKfrPw40+ZwfOtNsaL09igGbf+CqYiCnn+PD h6Mk7hgleMJmhhAWQcIVeNvm9QYGmQ+RncavwmwOLS1U8oeR6x1GFm1+gItbASBy3O3T OnpyV26/WKvRzCcYhXPwGRPupV2Ve9Mp0r2rNcN0RKGU1pKLH0Dl0SiujFAEpFe9LxI4 NOfIo/KwYy0SRnSzGUmcu8VNCSF3YeH2JsCTld/JFuSXZwkY5e1YEXgnRtk//B6FPcbo kKjTJNYOgYYq0l+2cG1tBx2VtrSB8OcPIN0FCLyuLDWBlUILgNPaV+7+n9PWwe9CYYyR zyaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=sQAvSFliNRzsihBO4D3II/hLNdzvUKs4D9QWENz0aT8=; b=ez/WhsxlvN4hfKFLJJXIgn//1C/7yJXAUbX+5qEnSDW3wZOp0J9UA31ICz3ZYDYxIV NWmUNwu1Im/XrxWcYxXH7PmxJOagnbvmSZnRHgEG5u5XO0yx5sx4cbEzV+hJdqsYgo/f g8ENrs9DKQWCmxQ83H2eqnFlPMl/OsyTMXLI7L2Hc1j8aX1FoIE58+X1x+dwCYdeWi8A 9TaW7cM5G62HwzFhu4Ukg6HZRnZgtPshR/vYlhtbn0MROfitN6LW7AXyS7zqHqazzv5N q5sJy0O9QxQ16JRbLvs4jQagpp+WVwhfipRLdiKOviDNZrTnLAEZ7EacZXlWOS8suXz7 fNNQ== X-Gm-Message-State: APjAAAWByUJUm7TU43ucpzeG4tNcflWlPAaWuMeSeeolVqkaj4+W+BRa Y68jpcKGFSnE+pEKZcsk3X4p3r5GQ+lV X-Google-Smtp-Source: APXvYqxsgpQKxPDMv2XBA/AMCE1G5HEXvJ3UK59pPVMrTkwRVe2S9FWqVL86NbwiC7uiehRoW5MDJppi6dSd X-Received: by 2002:a37:9b48:: with SMTP id d69mr14297756qke.449.1567150981129; Fri, 30 Aug 2019 00:43:01 -0700 (PDT) Date: Fri, 30 Aug 2019 15:42:39 +0800 In-Reply-To: <20190830074240.195166-1-tzungbi@google.com> Message-Id: <20190830074240.195166-4-tzungbi@google.com> Mime-Version: 1.0 References: <20190830074240.195166-1-tzungbi@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog From: Tzung-Bi Shih To: broonie@kernel.org Cc: tzungbi@google.com, alsa-devel@alsa-project.org, dgreid@google.com, cychiang@google.com Subject: [alsa-devel] [PATCH 3/4] ASoC: mediatek: mt8183: remove forward declaration of headset_init X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" The forward declaration of mt8183_mt6358_ts3a227_max98357_headset_init is for cyclic dependency between card, headset_dev, and headset_init. It used to be: - card depends on headset_dev - headset_dev depends on headset_init - headset_init depends on card Commit a962a809e5e4 ("ASoC: mediatek: mt8183: make headset codec optional") removed the cyclic dependency. Thus, it is safe to remove the forward declaration. Signed-off-by: Tzung-Bi Shih --- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index a7ad41b6e885..30a7735c4af3 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -390,14 +390,6 @@ mt8183_mt6358_ts3a227_max98357_dai_links[] = { }, }; -static int -mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *cpnt); - -static struct snd_soc_aux_dev mt8183_mt6358_ts3a227_max98357_headset_dev = { - .dlc = COMP_EMPTY(), - .init = mt8183_mt6358_ts3a227_max98357_headset_init, -}; - static struct snd_soc_card mt8183_mt6358_ts3a227_max98357_card = { .name = "mt8183_mt6358_ts3a227_max98357", .owner = THIS_MODULE, @@ -428,6 +420,11 @@ mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component) return ret; } +static struct snd_soc_aux_dev mt8183_mt6358_ts3a227_max98357_headset_dev = { + .dlc = COMP_EMPTY(), + .init = mt8183_mt6358_ts3a227_max98357_headset_init, +}; + static int mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) {