From patchwork Wed Mar 31 14:59:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 12175551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74F02C433ED for ; Wed, 31 Mar 2021 15:01:19 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 0F59261008 for ; Wed, 31 Mar 2021 15:01:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F59261008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=KGSb3lSnjUFqJF8BcU/lh9VwLTWEo8rHjInGia1XJ7c=; b=kRaHrVfNCUbZgAeH611jyNB40K C1FX67Jr2kjffgq4iZbs8RNGlecKKKb+FI2klIzQ9lOH3GVdYTYx0sTtwtrBC6C2VvXAD7A5o1rGV 5XBqFurhKKuiOmlvsp6GKQ74QPqi+uX2AD7KtPOOWRqovQjkShhwaOJ2fh0gQyM9GN5AJcotKg4it u/hgwzB6PTFI4eGdZ7YNjHtUfN+FrJ5zgMJGUDNB/66t2lWc30AQ17hqcJGvZ6PTDe4cIruWVzTRD J5JFTyIJIjWTn/LSdyEgIKjhaLBsNdjzwhXIEaCv+CcpQktjGQ38wRRjPmInYjAs/zKl/wMz+43aJ ij3TgYNg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRcJr-006qwG-Fs; Wed, 31 Mar 2021 14:59:43 +0000 Received: from galois.linutronix.de ([193.142.43.55]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRcJl-006qvC-WD for linux-arm-kernel@lists.infradead.org; Wed, 31 Mar 2021 14:59:40 +0000 From: bage@linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1617202776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tpNE9cpQx/VoSwO6XdMeRn/gHQ6U7zOiYQL9hIvAgPA=; b=4DCpsybV5r+HL/sn8roT4V24lZDX+8fRosGkxtdzaQRpRhNrrrAjDsadrM+77YnJohaB37 foK2XjGSuz5bloWxjDLW7YcAI+7/qDsRCTLEKc082IGrEWhNlO4ZPOE1sSgAMM7ClzD0b7 WmQZIBSeu8MI/rB9cHsBcooJsmnZaQkI9zqnfq2yaYkYX31r1Hwpui+ShyoKL6rZwIcU+K U/5vW+DYa1TGJxHUmZhfCuZQI/Ps2vuCa7d/XSFn0yPQZ586d9BaTomzaMuj2CDJpUuF+3 0MEP6xoDGI8c2+CyBrytjOiZ60Xo56J7CyuQPBXbeXyPVp5E5oc93iexDCG4hA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1617202776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tpNE9cpQx/VoSwO6XdMeRn/gHQ6U7zOiYQL9hIvAgPA=; b=tvXot048n8TH9q5c6Q9q5RzrdAoSlFgg/Ea+xfcGCuEjZBxYTtb+d7AftG1Z+PI5KuIpPa EpFc7ilNHvB+hHAQ== To: Maxime Ripard , Mark Brown , Chen-Yu Tsai Cc: Bastian Germann , linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org Subject: [PATCH] ASoC: sunxi: sun4i-codec: fill ASoC card owner Date: Wed, 31 Mar 2021 16:59:15 +0200 Message-Id: <20210331145915.12545-1-bage@linutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210331_155938_157563_9A9B5C9A X-CRM114-Status: UNSURE ( 8.41 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bastian Germann card->owner is a required property and since commit 81033c6b584b ("ALSA: core: Warn on empty module") a warning is issued if it is empty. Add it. This fixes following warning observed on Lamobo R1: WARNING: CPU: 1 PID: 190 at sound/core/init.c:207 snd_card_new+0x430/0x480 [snd] Modules linked in: sun4i_codec(E+) sun4i_backend(E+) snd_soc_core(E) ... CPU: 1 PID: 190 Comm: systemd-udevd Tainted: G C E 5.10.0-1-armmp #1 Debian 5.10.4-1 Hardware name: Allwinner sun7i (A20) Family [] (dump_backtrace) from [] (show_stack+0x20/0x24) [] (show_stack) from [] (dump_stack+0xc8/0xdc) [] (dump_stack) from [] (__warn+0xfc/0x158) [] (__warn) from [] (warn_slowpath_fmt+0x70/0xe4) [] (warn_slowpath_fmt) from [] (snd_card_new+0x430/0x480 [snd]) [] (snd_card_new [snd]) from [] (snd_soc_bind_card+0x3a8/0xa30 [snd_soc_core]) [] (snd_soc_bind_card [snd_soc_core]) from [] (snd_soc_register_card+0xf8/0x108 [snd_soc_core]) [] (snd_soc_register_card [snd_soc_core]) from [] (sun4i_codec_probe+0x224/0x45c [sun4i_codec]) [] (sun4i_codec_probe [sun4i_codec]) from [] (platform_drv_probe+0x58/0xa8) [] (platform_drv_probe) from [] (really_probe+0x108/0x510) [] (really_probe) from [] (driver_probe_device+0x100/0x1d0) [] (driver_probe_device) from [] (device_driver_attach+0xb8/0xc0) [] (device_driver_attach) from [] (__driver_attach+0x9c/0x150) [] (__driver_attach) from [] (bus_for_each_dev+0x84/0xd0) [] (bus_for_each_dev) from [] (driver_attach+0x2c/0x30) [] (driver_attach) from [] (bus_add_driver+0x120/0x20c) [] (bus_add_driver) from [] (driver_register+0x98/0x128) [] (driver_register) from [] (__platform_driver_register+0x50/0x58) [] (__platform_driver_register) from [] (sun4i_codec_driver_init+0x24/0x1000 [sun4i_codec]) [] (sun4i_codec_driver_init [sun4i_codec]) from [] (do_one_initcall+0x50/0x274) [] (do_one_initcall) from [] (do_init_module+0x70/0x294) [] (do_init_module) from [] (load_module+0x2258/0x263c) [] (load_module) from [] (sys_finit_module+0xc8/0x12c) [] (sys_finit_module) from [] (__sys_trace_return+0x0/0x1c) Fixes: 45fb6b6f2aa3 ("ASoC: sunxi: add support for the on-chip codec on early Allwinner SoCs") Related: commit 3c27ea23ffb4 ("ASoC: qcom: Set card->owner to avoid warnings") Related: commit ec653df2a0cb ("drm/vc4/vc4_hdmi: fill ASoC card owner") Cc: linux-arm-kernel@lists.infradead.org Cc: alsa-devel@alsa-project.org Signed-off-by: Bastian Germann --- sound/soc/sunxi/sun4i-codec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 6c13cc84b3fb..2173991c13db 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1364,6 +1364,7 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) return ERR_PTR(-ENOMEM); card->dev = dev; + card->owner = THIS_MODULE; card->name = "sun4i-codec"; card->dapm_widgets = sun4i_codec_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(sun4i_codec_card_dapm_widgets); @@ -1396,6 +1397,7 @@ static struct snd_soc_card *sun6i_codec_create_card(struct device *dev) return ERR_PTR(-ENOMEM); card->dev = dev; + card->owner = THIS_MODULE; card->name = "A31 Audio Codec"; card->dapm_widgets = sun6i_codec_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(sun6i_codec_card_dapm_widgets); @@ -1449,6 +1451,7 @@ static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev) return ERR_PTR(-ENOMEM); card->dev = dev; + card->owner = THIS_MODULE; card->name = "A23 Audio Codec"; card->dapm_widgets = sun6i_codec_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(sun6i_codec_card_dapm_widgets); @@ -1487,6 +1490,7 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev) return ERR_PTR(-ENOMEM); card->dev = dev; + card->owner = THIS_MODULE; card->name = "H3 Audio Codec"; card->dapm_widgets = sun6i_codec_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(sun6i_codec_card_dapm_widgets); @@ -1525,6 +1529,7 @@ static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev) return ERR_PTR(-ENOMEM); card->dev = dev; + card->owner = THIS_MODULE; card->name = "V3s Audio Codec"; card->dapm_widgets = sun6i_codec_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(sun6i_codec_card_dapm_widgets);