Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp2161878ioo; Mon, 23 May 2022 11:33:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlG5gWLGWIg05ALdmr66LPATUvs/f7mZyVRzmLGg4UXkI+AariD908f8g8HPkrAajZQidJ X-Received: by 2002:a17:902:7b83:b0:162:2486:7837 with SMTP id w3-20020a1709027b8300b0016224867837mr6282668pll.21.1653330808461; Mon, 23 May 2022 11:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653330808; cv=none; d=google.com; s=arc-20160816; b=b9KKKqDxVt2haf9hXfsbPOLuAAaW/LJ26gztz4bRYEmySJqxaPm0rnpRtpvVLSKE90 ifPHBCXMjHKfmCR89eZ15vT1CJuaoTNoZd9fOgr3BeptaL2+tExwJI5I318GRbW1pQNf EU6YVSt9d28Rgu0Wa6gWQYaR5IS4l1AUiqIfMaghtLEIOUvtGBCCMDHkl2SzmcQdjTsW RfGt6qvPPaRD4bPR/CD0QPRmghN/WQHKPOVQwbSn3i2x1aqcbCGmhRaTCmUubFATGJoE hGWuzJ68muKoKqMGYhGHEvC8n3C310TPQgxUp0HVWw+A3WbuoLP3KrUSQ4TnioJe++bB p7Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mEg2mR311aEyMgFZcHppAYPrTKe5ogemcrQNQLXQNAE=; b=eg2BWPLKbUEjy1IGEaJ11S6zf0Gq2lM9YP2iiSkKYrq3UC14M6bNmDRGLd3Zuu9vpn DWhoHqK2kT8o294GGYSVCGj1ffX8q0s7AQIRo4uCA68B2613LtoJka78aFD7IFYX5qDo d3MEApvDQNH069rfwlfBUZkmkpxmKZFy266ywRXPqKysgdJjvp8+ZvZwkPzdqmT4bPYL PymcjHc7dztw90N3LV1WuX7eblBV5L7sXFMFOLE3WVzzVZlSfl8Z8f7jjBqgFZMnlXPT 3s1AFbTQ4FnBoH74Iys77T+36H8BZ60axbOcCjugRJ6WgYit4IMXqOD30GZyfuYFqg0V SGqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RS54nRwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id k7-20020a170902c40700b0015abefdc1f1si12703568plk.285.2022.05.23.11.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 11:33:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RS54nRwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 544F03C738; Mon, 23 May 2022 11:31:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242066AbiEWRgu (ORCPT + 99 others); Mon, 23 May 2022 13:36:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241109AbiEWR0S (ORCPT ); Mon, 23 May 2022 13:26:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9134864BFD; Mon, 23 May 2022 10:21:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 516FCB81205; Mon, 23 May 2022 17:20:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5F03C385A9; Mon, 23 May 2022 17:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1653326400; bh=Hu1SSyqCQVTMebo6dKa24xARffRVVzp7BTC3VU3XQ8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RS54nRweIcEhfw/d5+k3b6S50eAEDb6kSOCnhm59awY4i1K285oCxWgP/IdbxwnXC EX/ec5vWuZgXyOpjGKAA6nQLYykygh7xAAWREdw2Eb8ul20RC6JWcsj4rMYiXIVm59 LZmA0+OA3bbimLzSSaj0kunf38EyO2jRHWERcmwY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , kernel test robot , Takashi Iwai , Sasha Levin Subject: [PATCH 5.15 069/132] ALSA: hda - fix unused Realtek function when PM is not enabled Date: Mon, 23 May 2022 19:04:38 +0200 Message-Id: <20220523165834.614670670@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220523165823.492309987@linuxfoundation.org> References: <20220523165823.492309987@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit c3d9ca93f1e3bd3d1adfc4479a12c82fed424c87 ] When CONFIG_PM is not enabled, alc_shutup() is not needed, so move it inside the #ifdef CONFIG_PM guard. Also drop some contiguous #endif / #ifdef CONFIG_PM for simplicity. Fixes this build warning: sound/pci/hda/patch_realtek.c:886:20: warning: unused function 'alc_shutup' Fixes: 08c189f2c552 ("ALSA: hda - Use generic parser codes for Realtek driver") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Link: https://lore.kernel.org/r/20220430193318.29024-1-rdunlap@infradead.org Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_realtek.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1880e30341a0..040825ea9a08 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -932,6 +932,9 @@ static int alc_init(struct hda_codec *codec) return 0; } +#define alc_free snd_hda_gen_free + +#ifdef CONFIG_PM static inline void alc_shutup(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; @@ -945,9 +948,6 @@ static inline void alc_shutup(struct hda_codec *codec) alc_shutup_pins(codec); } -#define alc_free snd_hda_gen_free - -#ifdef CONFIG_PM static void alc_power_eapd(struct hda_codec *codec) { alc_auto_setup_eapd(codec, false); @@ -961,9 +961,7 @@ static int alc_suspend(struct hda_codec *codec) spec->power_hook(codec); return 0; } -#endif -#ifdef CONFIG_PM static int alc_resume(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; -- 2.35.1