From patchwork Mon May 6 16:13:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655699 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55F46155757 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=K1+/SHisCHGeWA1KAyGHuwkzv/zrXnIq0ivOG7ip0oORZehwxiLjRKhXR/uj9mD1yIN/VWrL8YBTlibOQXcmSQALlzQy7tVtabFh90peqjINQ931VFOw1CVguDiifJg8z2DkR+5wGQ+6ANsEMC1k0Ek0xpT0yOWW/E9P94YBM/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=Jt9owUMs0yD9snXK08xVvHlCYzeMe1nvtxH2sOVCTL8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JdTMCG/ZlBDN5Reyw7RNlRiugqMZy/6EW81HC6jCu1wC/sLBNCqrJH/AIOljp8ce619FM7gkFX3aS6SmAHrcccK4H8asRY1jMFMEzQIXCks//ERsW4ipQLHOtaDP3VpJEzgzMJ1ZA9bV0NkkATWNiciNjLeLBwB47qBfKPntZto= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jTX3rHya; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3akVls27; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jTX3rHya; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3akVls27; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jTX3rHya"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3akVls27"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jTX3rHya"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3akVls27" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 827E31F79B; Mon, 6 May 2024 16:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ik1gmx8DUckXSti25lP4/S7Tif7RaevTKn46eIF8tZY=; b=jTX3rHyady/pa6OqjCg3wKzcMVOSoKostiAtgkZjziCnVluRUD25ZiDlltQpL3rgb4Xa4j VJY0ultQtmJNvhca+DCKgyVZq2Ha5LHaZtqydOgVD2iI/MOnahN9fU5zTJ5CTleojzFgjB pPTUk741s2MihePG4673rpGU1hgMzXg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ik1gmx8DUckXSti25lP4/S7Tif7RaevTKn46eIF8tZY=; b=3akVls276qWxqrAvAK62CPnrezm/21wcPPK35iaIjwzhslVKwcl4Y+tj6IkNKmHPRi7EYd g9HkGuadsmMD54Cw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jTX3rHya; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3akVls27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ik1gmx8DUckXSti25lP4/S7Tif7RaevTKn46eIF8tZY=; b=jTX3rHyady/pa6OqjCg3wKzcMVOSoKostiAtgkZjziCnVluRUD25ZiDlltQpL3rgb4Xa4j VJY0ultQtmJNvhca+DCKgyVZq2Ha5LHaZtqydOgVD2iI/MOnahN9fU5zTJ5CTleojzFgjB pPTUk741s2MihePG4673rpGU1hgMzXg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ik1gmx8DUckXSti25lP4/S7Tif7RaevTKn46eIF8tZY=; b=3akVls276qWxqrAvAK62CPnrezm/21wcPPK35iaIjwzhslVKwcl4Y+tj6IkNKmHPRi7EYd g9HkGuadsmMD54Cw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 669B113A31; Mon, 6 May 2024 16:13:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id MFLeF70BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:49 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 01/12] ALSA: hda: intel: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:44 +0200 Message-ID: <20240506161359.6960-2-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 827E31F79B X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] snd-hda-intel contains lots of CONFIG_PM dependent code although CONFIG_PM is almost mandatory nowadays, and it makes the code unnecessarily complex. Let's reduce the dependencies of CONFIG_PM in snd-hda-intel driver code. I left a few module options to be dependent on CONFIG_PM (which are visible to users), but other places are either enabled or optimized by compiler automatically. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_intel.c | 46 ++++++++++----------------------- sound/pci/hda/hda_intel_trace.h | 2 -- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1b550c42db09..31b0c954b0c8 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -186,8 +186,10 @@ MODULE_PARM_DESC(pm_blacklist, "Enable power-management denylist"); static bool power_save_controller = 1; module_param(power_save_controller, bool, 0644); MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode."); -#else +#else /* CONFIG_PM */ #define power_save 0 +#define pm_blacklist false +#define power_save_controller false #endif /* CONFIG_PM */ static int align_buffer_size = -1; @@ -890,7 +892,6 @@ static void __azx_shutdown_chip(struct azx *chip, bool skip_link_reset) display_power(chip, false); } -#ifdef CONFIG_PM static DEFINE_MUTEX(card_list_lock); static LIST_HEAD(card_list); @@ -916,7 +917,7 @@ static void azx_del_card_list(struct azx *chip) } /* trigger power-save check at writing parameter */ -static int param_set_xint(const char *val, const struct kernel_param *kp) +static int __maybe_unused param_set_xint(const char *val, const struct kernel_param *kp) { struct hda_intel *hda; struct azx *chip; @@ -987,7 +988,6 @@ static void __azx_runtime_resume(struct azx *chip) display_power(chip, false); } -#ifdef CONFIG_PM_SLEEP static int azx_prepare(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); @@ -1046,7 +1046,7 @@ static int azx_suspend(struct device *dev) return 0; } -static int azx_resume(struct device *dev) +static int __maybe_unused azx_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1097,9 +1097,8 @@ static int azx_thaw_noirq(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ -static int azx_runtime_suspend(struct device *dev) +static int __maybe_unused azx_runtime_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1116,7 +1115,7 @@ static int azx_runtime_suspend(struct device *dev) return 0; } -static int azx_runtime_resume(struct device *dev) +static int __maybe_unused azx_runtime_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1133,7 +1132,7 @@ static int azx_runtime_resume(struct device *dev) return 0; } -static int azx_runtime_idle(struct device *dev) +static int __maybe_unused azx_runtime_idle(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1159,23 +1158,14 @@ static int azx_runtime_idle(struct device *dev) } static const struct dev_pm_ops azx_pm = { - SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) -#ifdef CONFIG_PM_SLEEP - .prepare = azx_prepare, - .complete = azx_complete, - .freeze_noirq = azx_freeze_noirq, - .thaw_noirq = azx_thaw_noirq, -#endif + SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) + .prepare = pm_sleep_ptr(azx_prepare), + .complete = pm_sleep_ptr(azx_complete), + .freeze_noirq = pm_sleep_ptr(azx_freeze_noirq), + .thaw_noirq = pm_sleep_ptr(azx_thaw_noirq), SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) }; -#define AZX_PM_OPS &azx_pm -#else -#define azx_add_card_list(chip) /* NOP */ -#define azx_del_card_list(chip) /* NOP */ -#define AZX_PM_OPS NULL -#endif /* CONFIG_PM */ - static int azx_probe_continue(struct azx *chip); @@ -2206,7 +2196,6 @@ static int azx_probe(struct pci_dev *pci, return err; } -#ifdef CONFIG_PM /* On some boards setting power_save to a non 0 value leads to clicking / * popping sounds when ever we enter/leave powersaving mode. Ideally we would * figure out how to avoid these sounds, but that is not always feasible. @@ -2248,13 +2237,11 @@ static const struct snd_pci_quirk power_save_denylist[] = { SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0), {} }; -#endif /* CONFIG_PM */ static void set_default_power_save(struct azx *chip) { int val = power_save; -#ifdef CONFIG_PM if (pm_blacklist) { const struct snd_pci_quirk *q; @@ -2265,7 +2252,6 @@ static void set_default_power_save(struct azx *chip) val = 0; } } -#endif /* CONFIG_PM */ snd_hda_set_power_save(&chip->bus, val * 1000); } @@ -2321,10 +2307,6 @@ static int azx_probe_continue(struct azx *chip) chip->fw->data); if (err < 0) goto out_free; -#ifndef CONFIG_PM - release_firmware(chip->fw); /* no longer needed */ - chip->fw = NULL; -#endif } #endif @@ -2765,7 +2747,7 @@ static struct pci_driver azx_driver = { .remove = azx_remove, .shutdown = azx_shutdown, .driver = { - .pm = AZX_PM_OPS, + .pm = &azx_pm, }, }; diff --git a/sound/pci/hda/hda_intel_trace.h b/sound/pci/hda/hda_intel_trace.h index 73a7adfa192d..2775fa81a500 100644 --- a/sound/pci/hda/hda_intel_trace.h +++ b/sound/pci/hda/hda_intel_trace.h @@ -34,7 +34,6 @@ DEFINE_EVENT(hda_pm, azx_resume, TP_ARGS(chip) ); -#ifdef CONFIG_PM DEFINE_EVENT(hda_pm, azx_runtime_suspend, TP_PROTO(struct azx *chip), TP_ARGS(chip) @@ -44,7 +43,6 @@ DEFINE_EVENT(hda_pm, azx_runtime_resume, TP_PROTO(struct azx *chip), TP_ARGS(chip) ); -#endif #endif /* _TRACE_HDA_INTEL_H */ From patchwork Mon May 6 16:13:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655697 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5820E155A59 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=oFAJOIfer/VJ1Ek4Ju9wc6/CGckK0laFx0Irqr24EanujpEza9rWL72Yz4FFlhV4+mGZXUz3QJva7LSOUCr39wdFcknrl+PRcJBGgTkfI+T8oXRxToNyeROBHp6O/dM/11otxMEFB8HbAcB1qnP6cbEsAestrVJcY88A4oPHKXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=Z5yV8BHOiA2Y/WdXnLz7KIeCjNG8B/wEoV+ZQYhz1ps=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q0b4AMjVMBhfHa6HqH9xpFRejVDp/ifRE403H8kmQFQ46X/lj01DeZ3Qv7FDCom2pkRANEsXik+YnPoyJd/892lBhgmW0ka9Eg8EWhLp/u9px28YW75SWbwlWPmZocfuPb4hiKpvf9uWvRuI0XoJVjShu/G2c981PSjxUEyXPmE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=yShuTUrh; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=xJEM6e33; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=yShuTUrh; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=xJEM6e33; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="yShuTUrh"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="xJEM6e33"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="yShuTUrh"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="xJEM6e33" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A0D3D385DF; Mon, 6 May 2024 16:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6uUUasKMijLTZn54Z5UXQyA/tVYhi/Hut9fV7jXYlU=; b=yShuTUrhjZmpQqqiYLnJJrPjHN/pWHJAHNBZ97xPCYGI4LzJdMmfEbECSKVLgD6xkP7M5b E3xraye8eUXIk0iGP5yO3OVVfYYTycXfiCAAC0tjuIyyO6nJ9QqhpYrBHYO5J5w/ZwK50Z YMOLEtyP3ghAmJwl49AvXn2X0k+Omqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6uUUasKMijLTZn54Z5UXQyA/tVYhi/Hut9fV7jXYlU=; b=xJEM6e33StYJpYAB1JoZ/zi3R6/W5B2V8kCg5BT8rBWVoATnFq4C7012cpmOuj6nW+oMix aZeWfjYObLsyxQBw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6uUUasKMijLTZn54Z5UXQyA/tVYhi/Hut9fV7jXYlU=; b=yShuTUrhjZmpQqqiYLnJJrPjHN/pWHJAHNBZ97xPCYGI4LzJdMmfEbECSKVLgD6xkP7M5b E3xraye8eUXIk0iGP5yO3OVVfYYTycXfiCAAC0tjuIyyO6nJ9QqhpYrBHYO5J5w/ZwK50Z YMOLEtyP3ghAmJwl49AvXn2X0k+Omqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6uUUasKMijLTZn54Z5UXQyA/tVYhi/Hut9fV7jXYlU=; b=xJEM6e33StYJpYAB1JoZ/zi3R6/W5B2V8kCg5BT8rBWVoATnFq4C7012cpmOuj6nW+oMix aZeWfjYObLsyxQBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 873621386E; Mon, 6 May 2024 16:13:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id iJXRH70BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:49 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 02/12] ALSA: hda: codec: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:45 +0200 Message-ID: <20240506161359.6960-3-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.983]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO CONFIG_PM is almost mandatory nowadays for real systems, but we have lots of CONFIG_PM dependent code in snd-hda-codec helper code. Let's reduce the dependencies of CONFIG_PM now. The only visible drawback would be a couple of superfluous trace entries for runtime PM, but we can live with that. Signed-off-by: Takashi Iwai --- include/sound/hda_codec.h | 11 ---------- sound/pci/hda/hda_codec.c | 37 +++++++++------------------------- sound/pci/hda/hda_controller.c | 2 -- sound/pci/hda/hda_sysfs.c | 4 ---- 4 files changed, 10 insertions(+), 44 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 9c94ba7c183d..575e55aa08ca 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -109,11 +109,9 @@ struct hda_codec_ops { void (*unsol_event)(struct hda_codec *codec, unsigned int res); void (*set_power_state)(struct hda_codec *codec, hda_nid_t fg, unsigned int power_state); -#ifdef CONFIG_PM int (*suspend)(struct hda_codec *codec); int (*resume)(struct hda_codec *codec); int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid); -#endif void (*stream_pm)(struct hda_codec *codec, hda_nid_t nid, bool on); }; @@ -259,11 +257,9 @@ struct hda_codec { unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */ unsigned int ctl_dev_id:1; /* old control element id build behaviour */ -#ifdef CONFIG_PM unsigned long power_on_acct; unsigned long power_off_acct; unsigned long power_jiffies; -#endif /* filter the requested power state per nid */ unsigned int (*power_filter)(struct hda_codec *codec, hda_nid_t nid, @@ -481,10 +477,8 @@ extern const struct dev_pm_ops hda_codec_driver_pm; static inline int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid) { -#ifdef CONFIG_PM if (codec->patch_ops.check_power_status) return codec->patch_ops.check_power_status(codec, nid); -#endif return 0; } @@ -495,14 +489,9 @@ int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid) #define snd_hda_power_up_pm(codec) snd_hdac_power_up_pm(&(codec)->core) #define snd_hda_power_down(codec) snd_hdac_power_down(&(codec)->core) #define snd_hda_power_down_pm(codec) snd_hdac_power_down_pm(&(codec)->core) -#ifdef CONFIG_PM void snd_hda_codec_set_power_save(struct hda_codec *codec, int delay); void snd_hda_set_power_save(struct hda_bus *bus, int delay); void snd_hda_update_power_acct(struct hda_codec *codec); -#else -static inline void snd_hda_codec_set_power_save(struct hda_codec *codec, int delay) {} -static inline void snd_hda_set_power_save(struct hda_bus *bus, int delay) {} -#endif static inline bool hda_codec_need_resume(struct hda_codec *codec) { diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 2cac337f5263..325e8f0b99a8 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -616,7 +616,6 @@ void snd_hda_shutup_pins(struct hda_codec *codec) } EXPORT_SYMBOL_GPL(snd_hda_shutup_pins); -#ifdef CONFIG_PM /* Restore the pin controls cleared previously via snd_hda_shutup_pins() */ static void restore_shutup_pins(struct hda_codec *codec) { @@ -634,7 +633,6 @@ static void restore_shutup_pins(struct hda_codec *codec) } codec->pins_shutup = 0; } -#endif static void hda_jackpoll_work(struct work_struct *work) { @@ -1001,9 +999,7 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card, codec->card = card; codec->addr = codec_addr; -#ifdef CONFIG_PM codec->power_jiffies = jiffies; -#endif snd_hda_sysfs_init(codec); @@ -1238,7 +1234,6 @@ static void purify_inactive_streams(struct hda_codec *codec) } } -#ifdef CONFIG_PM /* clean up all streams; called from suspend */ static void hda_cleanup_all_streams(struct hda_codec *codec) { @@ -1250,7 +1245,6 @@ static void hda_cleanup_all_streams(struct hda_codec *codec) really_cleanup_stream(codec, p); } } -#endif /* * amp access functions @@ -2858,7 +2852,6 @@ static void hda_exec_init_verbs(struct hda_codec *codec) static inline void hda_exec_init_verbs(struct hda_codec *codec) {} #endif -#ifdef CONFIG_PM /* update the power on/off account with the current jiffies */ static void update_power_acct(struct hda_codec *codec, bool on) { @@ -2966,9 +2959,6 @@ static int hda_codec_runtime_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM */ - -#ifdef CONFIG_PM_SLEEP static int hda_codec_pm_prepare(struct device *dev) { struct hda_codec *codec = dev_to_hda_codec(dev); @@ -3023,22 +3013,19 @@ static int hda_codec_pm_restore(struct device *dev) dev->power.power_state = PMSG_RESTORE; return pm_runtime_force_resume(dev); } -#endif /* CONFIG_PM_SLEEP */ /* referred in hda_bind.c */ const struct dev_pm_ops hda_codec_driver_pm = { -#ifdef CONFIG_PM_SLEEP - .prepare = hda_codec_pm_prepare, - .complete = hda_codec_pm_complete, - .suspend = hda_codec_pm_suspend, - .resume = hda_codec_pm_resume, - .freeze = hda_codec_pm_freeze, - .thaw = hda_codec_pm_thaw, - .poweroff = hda_codec_pm_suspend, - .restore = hda_codec_pm_restore, -#endif /* CONFIG_PM_SLEEP */ - SET_RUNTIME_PM_OPS(hda_codec_runtime_suspend, hda_codec_runtime_resume, - NULL) + .prepare = pm_sleep_ptr(hda_codec_pm_prepare), + .complete = pm_sleep_ptr(hda_codec_pm_complete), + .suspend = pm_sleep_ptr(hda_codec_pm_suspend), + .resume = pm_sleep_ptr(hda_codec_pm_resume), + .freeze = pm_sleep_ptr(hda_codec_pm_freeze), + .thaw = pm_sleep_ptr(hda_codec_pm_thaw), + .poweroff = pm_sleep_ptr(hda_codec_pm_suspend), + .restore = pm_sleep_ptr(hda_codec_pm_restore), + .runtime_suspend = pm_ptr(hda_codec_runtime_suspend), + .runtime_resume = pm_ptr(hda_codec_runtime_resume), }; /* suspend the codec at shutdown; called from driver's shutdown callback */ @@ -3425,7 +3412,6 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, } EXPORT_SYMBOL_GPL(snd_hda_add_new_ctls); -#ifdef CONFIG_PM /** * snd_hda_codec_set_power_save - Configure codec's runtime PM * @codec: codec device to configure @@ -3516,7 +3502,6 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec, return 0; } EXPORT_SYMBOL_GPL(snd_hda_check_amp_list_power); -#endif /* * input MUX helper @@ -4060,12 +4045,10 @@ void snd_hda_bus_reset_codecs(struct hda_bus *bus) /* FIXME: maybe a better way needed for forced reset */ if (current_work() != &codec->jackpoll_work.work) cancel_delayed_work_sync(&codec->jackpoll_work); -#ifdef CONFIG_PM if (hda_codec_is_power_on(codec)) { hda_call_codec_suspend(codec); hda_call_codec_resume(codec); } -#endif } } diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 206306a0eb82..c7142eee9f35 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1075,11 +1075,9 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) bool active, handled = false; int repeat = 0; /* count for avoiding endless loop */ -#ifdef CONFIG_PM if (azx_has_pm_runtime(chip)) if (!pm_runtime_active(chip->card->dev)) return IRQ_NONE; -#endif spin_lock(&bus->reg_lock); diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index 69ebc37a4d6f..265fd4737893 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -26,7 +26,6 @@ struct hda_hint { const char *val; /* contained in the same alloc as key */ }; -#ifdef CONFIG_PM static ssize_t power_on_acct_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -47,7 +46,6 @@ static ssize_t power_off_acct_show(struct device *dev, static DEVICE_ATTR_RO(power_on_acct); static DEVICE_ATTR_RO(power_off_acct); -#endif /* CONFIG_PM */ #define CODEC_INFO_SHOW(type, field) \ static ssize_t type##_show(struct device *dev, \ @@ -745,10 +743,8 @@ static struct attribute *hda_dev_attrs[] = { &dev_attr_modelname.attr, &dev_attr_init_pin_configs.attr, &dev_attr_driver_pin_configs.attr, -#ifdef CONFIG_PM &dev_attr_power_on_acct.attr, &dev_attr_power_off_acct.attr, -#endif #ifdef CONFIG_SND_HDA_RECONFIG &dev_attr_init_verbs.attr, &dev_attr_hints.attr, From patchwork Mon May 6 16:13:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655696 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62837156221 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012032; cv=none; b=GmE+PlKwkYgUctlgRGdHB9dxpocwFIJHByx76K6GX8JldQwrds3c/b2STo4AVXUVhDTQuzVkuyqavl3RK/EfRhyDcX5DV9Q9dbzerpiRpo60MkMFYoFgrSahhX4egh+exfHt0jOrinwP8Lp3adBj8q77IlHBKIKu14iz7Gt3iTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012032; c=relaxed/simple; bh=tenHXb/DjLcnoVyZGN7YnozgLDnSeKij8sKLLG6jgxY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lon/hsE1Xq8NPVi2rBiESHNCYJ9ytTDY1yxgWMKdg9VvbYARL87/RQIVQJzsJ4h1kn7ctnCAnJ3pITstHZaHlcqLOMbmpYmnTLMX5CBNZASLhUipmm3Tz5cN+iwfDITrpQzCeSZ2fZFqAGXkJiKpBoH75rAZBe2kEyyBtiRO/LU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=UUlS0Agi; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3Uu/9+bH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=UUlS0Agi; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3Uu/9+bH; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="UUlS0Agi"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3Uu/9+bH"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="UUlS0Agi"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3Uu/9+bH" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C3372385E0; Mon, 6 May 2024 16:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EmP04HHUMr6jyySnZ0A40CC+x7GGBp4pAhBm+AIEgAc=; b=UUlS0AgiRKOgptYCezkB8m/3qTcJ9m+fO/JOaarhdX2WWRE25mL+E1XdO22gOh8Sq6Z9rb jxxi4RMlONo/s0PWKTwfiSO0hLLQ7fy2rsGdLfidm7HvWgCBNM3O00FQUmam0rfoOr0z4q y9ifdyGOku9uno/beCtKbFU1UmfI/oc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EmP04HHUMr6jyySnZ0A40CC+x7GGBp4pAhBm+AIEgAc=; b=3Uu/9+bH6SnHK8p6wHl1e1UgYxFVBkxwbPjVIAXXougd0QFhL4lyOpiKjTrWPIs2F+vM4c 1HIGTMDciinnT3Dw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EmP04HHUMr6jyySnZ0A40CC+x7GGBp4pAhBm+AIEgAc=; b=UUlS0AgiRKOgptYCezkB8m/3qTcJ9m+fO/JOaarhdX2WWRE25mL+E1XdO22gOh8Sq6Z9rb jxxi4RMlONo/s0PWKTwfiSO0hLLQ7fy2rsGdLfidm7HvWgCBNM3O00FQUmam0rfoOr0z4q y9ifdyGOku9uno/beCtKbFU1UmfI/oc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EmP04HHUMr6jyySnZ0A40CC+x7GGBp4pAhBm+AIEgAc=; b=3Uu/9+bH6SnHK8p6wHl1e1UgYxFVBkxwbPjVIAXXougd0QFhL4lyOpiKjTrWPIs2F+vM4c 1HIGTMDciinnT3Dw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A78C913A32; Mon, 6 May 2024 16:13:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id UI9sJ70BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:49 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 03/12] ALSA: hda: generic: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:46 +0200 Message-ID: <20240506161359.6960-4-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Score: -0.57 X-Spam-Level: X-Spamd-Result: default: False [-0.57 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.77)[84.36%]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.982]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio generic codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_generic.c | 4 ---- sound/pci/hda/hda_generic.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index de2a3d08c73c..f64d9dc197a3 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -6021,7 +6021,6 @@ void snd_hda_gen_free(struct hda_codec *codec) } EXPORT_SYMBOL_GPL(snd_hda_gen_free); -#ifdef CONFIG_PM /** * snd_hda_gen_check_power_status - check the loopback power save state * @codec: the HDA codec @@ -6035,7 +6034,6 @@ int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid) return snd_hda_check_amp_list_power(codec, &spec->loopback, nid); } EXPORT_SYMBOL_GPL(snd_hda_gen_check_power_status); -#endif /* @@ -6048,9 +6046,7 @@ static const struct hda_codec_ops generic_patch_ops = { .init = snd_hda_gen_init, .free = snd_hda_gen_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .check_power_status = snd_hda_gen_check_power_status, -#endif }; /* diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index a8eea8367629..8f5ecf740c49 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -340,9 +340,7 @@ void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, struct hda_jack_callback *jack); void snd_hda_gen_update_outputs(struct hda_codec *codec); -#ifdef CONFIG_PM int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid); -#endif unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, hda_nid_t nid, unsigned int power_state); From patchwork Mon May 6 16:13:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655698 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96BB0155A52 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=DuEDv4s4F23S9VfGHfSGdvMMWZIZoAZS+VfwZTJ8n3GLCJETDP5F+Z6JDGtx11O3sGpEarCFONbXm3MKBZr7S/AsriHwKnYYhJkmvcYDEqNObmHk4lY4SUtEfXC41y51NwXIsOmvqfXjgG6ITR5V5zX5T+pqhpGttpkTDb5UKL4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=Oqce4MVGd+h8s81wdwAGkjCHHfwBD+g0MGpFE3mjZyI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HdCWgIRh9S4zicuIlQqM243XIV54U+SN9sXt3dCJ6xy3D6h/xSxqtb2IcA2lMgmUY7LDzG9pC5vh/7M6UfkCAjpo0v2/tpj1tvbfB0YuZ4SuxIRrvT6LyjE3jDvFDDbdT6eJrrsPDf0zjlVJzXU6ucNvVvrImndjlTYScLm/BoE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jnLYjRL+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NTVB5bZk; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jnLYjRL+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NTVB5bZk; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jnLYjRL+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NTVB5bZk"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jnLYjRL+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NTVB5bZk" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E0D441F7A2; Mon, 6 May 2024 16:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QYyzocnRP5NxBuHRd65vHtzN30F0NDwxFhddvypb/FQ=; b=jnLYjRL+usVckM5c38jLLZwREAk3zkb64YkP5vKcM24Q4P3xmiYa368wfwO8fqr6Q3FvAW Jl8WhhORlMjrk0AgKwYULoz7lvI/uXecY1RBxKMZyfyAcKQeVsR4byJoA4brS/Ijpp+VNf 1ii3NsGzRKWkCz6hNJQHgg4syYbjfFg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QYyzocnRP5NxBuHRd65vHtzN30F0NDwxFhddvypb/FQ=; b=NTVB5bZk5zClsr0l0uBPu/U9FoD2xvncDaUPU5DE5GfmKC5gr3iJTsSKhwSSJcqFtmpokD gbt2kjg+VAVPABBg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnLYjRL+; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=NTVB5bZk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QYyzocnRP5NxBuHRd65vHtzN30F0NDwxFhddvypb/FQ=; b=jnLYjRL+usVckM5c38jLLZwREAk3zkb64YkP5vKcM24Q4P3xmiYa368wfwO8fqr6Q3FvAW Jl8WhhORlMjrk0AgKwYULoz7lvI/uXecY1RBxKMZyfyAcKQeVsR4byJoA4brS/Ijpp+VNf 1ii3NsGzRKWkCz6hNJQHgg4syYbjfFg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012029; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QYyzocnRP5NxBuHRd65vHtzN30F0NDwxFhddvypb/FQ=; b=NTVB5bZk5zClsr0l0uBPu/U9FoD2xvncDaUPU5DE5GfmKC5gr3iJTsSKhwSSJcqFtmpokD gbt2kjg+VAVPABBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C78511386E; Mon, 6 May 2024 16:13:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id yFdCL70BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:49 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 04/12] ALSA: hda: analog: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:47 +0200 Message-ID: <20240506161359.6960-5-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-1.58 / 50.00]; BAYES_HAM(-1.57)[92.22%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: E0D441F7A2 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Score: -1.58 CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio analog codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_analog.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 8afe6000f7da..1e9dadcdc51b 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -72,7 +72,6 @@ static int create_beep_ctls(struct hda_codec *codec) #define create_beep_ctls(codec) 0 #endif -#ifdef CONFIG_PM static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front, hda_nid_t hp) { @@ -118,7 +117,6 @@ static int ad198x_suspend(struct hda_codec *codec) ad198x_power_eapd(codec); return 0; } -#endif /* follow EAPD via vmaster hook */ static void ad_vmaster_eapd_hook(void *private_data, int enabled) @@ -158,10 +156,8 @@ static const struct hda_codec_ops ad198x_auto_patch_ops = { .init = snd_hda_gen_init, .free = snd_hda_gen_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .check_power_status = snd_hda_gen_check_power_status, .suspend = ad198x_suspend, -#endif }; From patchwork Mon May 6 16:13:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655700 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5209156223 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=m0avEYijaLrjEYTQwWyZwnIu8soWBcsclJj7kpAeTXBMT+m5lHi7bhLEkkkiV5x0t8OMERyp2QgxgcUQfErP7eU5nrCBVcNUmILnZPEI0msKhs7LeM8LD/GEbtmwg/zDZ1hg1vVPF0yI0unP6oixOT7bZwTR4VD8Z5jKR+PHBJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=EVLNe1l3sZ3fv+e2AJ+ufMucpyyBTKNnRhw8Jv2pQ/Y=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jQnijGnBvNiHsOMzT/3hFHX5LBy4AzJ6L+vTOzh8KT2kkBRKbPjQtk8c11eOVn0jj8zbUyO48zVARGnieF1UzPoTVzcinvwIuHcoTIA27EsFpKQd2ny0euKgnLeDKqU37sdwKD1NDchM9JP5NWi0VLdbndlVx+fFfw4RinUIyYU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Uyuwlsc5; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=1twUv2CO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Uyuwlsc5; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=1twUv2CO; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Uyuwlsc5"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="1twUv2CO"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Uyuwlsc5"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="1twUv2CO" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0FD4C385E1; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dNf+du6zNNSHu7KBY+sp1qKFV2PdyFSGIYs5aSbtgd4=; b=Uyuwlsc5y1WcJyzEbnay3OYq4VbcMg0kQ9SLLFigsuySOZigsXBQ/BU3Kb7ljJ32NIyrsg /W/LXJ3ATmgffw/m23E4B8csZKjKkq6HqdFfzc79mvxagT4eQuTOsI/qBCJhFJSsCpPLug IGlg/0v4VgtfvqMpSDV3R2pOkktGU+c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dNf+du6zNNSHu7KBY+sp1qKFV2PdyFSGIYs5aSbtgd4=; b=1twUv2COv/Ehv9OqJJaQriH/uDwdnhHmqxA3F/d9oLap7sX8Xpd/tDhBbCxx9fFSviOsce TTepNMXybwpU/9AQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dNf+du6zNNSHu7KBY+sp1qKFV2PdyFSGIYs5aSbtgd4=; b=Uyuwlsc5y1WcJyzEbnay3OYq4VbcMg0kQ9SLLFigsuySOZigsXBQ/BU3Kb7ljJ32NIyrsg /W/LXJ3ATmgffw/m23E4B8csZKjKkq6HqdFfzc79mvxagT4eQuTOsI/qBCJhFJSsCpPLug IGlg/0v4VgtfvqMpSDV3R2pOkktGU+c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dNf+du6zNNSHu7KBY+sp1qKFV2PdyFSGIYs5aSbtgd4=; b=1twUv2COv/Ehv9OqJJaQriH/uDwdnhHmqxA3F/d9oLap7sX8Xpd/tDhBbCxx9fFSviOsce TTepNMXybwpU/9AQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E634313A31; Mon, 6 May 2024 16:13:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id 0FYLN70BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:49 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 05/12] ALSA: hda: ca0132: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:48 +0200 Message-ID: <20240506161359.6960-6-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Score: -0.65 X-Spam-Level: X-Spamd-Result: default: False [-0.65 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.85)[85.40%]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.982]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio ca0132 codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_ca0132.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index aa312441604f..e4673a71551a 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -9682,7 +9682,6 @@ static void dbpro_free(struct hda_codec *codec) kfree(codec->spec); } -#ifdef CONFIG_PM static int ca0132_suspend(struct hda_codec *codec) { struct ca0132_spec *spec = codec->spec; @@ -9690,7 +9689,6 @@ static int ca0132_suspend(struct hda_codec *codec) cancel_delayed_work_sync(&spec->unsol_hp_work); return 0; } -#endif static const struct hda_codec_ops ca0132_patch_ops = { .build_controls = ca0132_build_controls, @@ -9698,9 +9696,7 @@ static const struct hda_codec_ops ca0132_patch_ops = { .init = ca0132_init, .free = ca0132_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .suspend = ca0132_suspend, -#endif }; static const struct hda_codec_ops dbpro_patch_ops = { From patchwork Mon May 6 16:13:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655701 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB74E156226 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=mVrmRor+5oV6p/iZIKhcDFD0s5QfV+Rsm8WQprd9CmRaHBhA1m9+ztv0S9ekAcofV6LLMWmMcE6dYdN6YXykutyjCp5zu5vC8nfEiwDU70wFzncYMAM6ubPfAFv1DQg5Fr3uOxcHNy53TokFWcLQRtW480ZCcmhUDFrPWugvcJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=z1sc06JGX2kEDKosWeRkn1GELltsYgXH1ZHkdIuQEGI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qQbywKFz1wp9ghZNvLc4WYOWYfwnmz7ACLNb+LGjZ05CtgD6FyB8ilxz0gfeWQCR8+3ipfYODQW05ejx1Z7Sh2LKXPDtlAiuJdPYMFO1NOShdYNk9IrEKXiOAKR/IsGTEs5rWU2SsLytWSE84gMouMiRVQkAsGBn7NIl0WubPPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=rKnkqnYM; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=+HPfKfiX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=rKnkqnYM; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=+HPfKfiX; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="rKnkqnYM"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="+HPfKfiX"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="rKnkqnYM"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="+HPfKfiX" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2F982385E2; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CKj9obhT5XwUS1+mmibYsHdcnjG3RmCBQIaLB5nTkiY=; b=rKnkqnYMwUvBCNfHyI+KUD7yYW/l8VvoSYM6kbyKQFo0GL4I4yaDLUvE9N7HOyL3N4qloG d8e4G/m5nwnOb9y1g1ofNbaTb5vgUW0F/hTRmtu7iPLO/XqpuI3qwEueL9vcX4fpRNJWEs HVham+H+5yp1Oh0XcKYsZn+F23dmsvU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CKj9obhT5XwUS1+mmibYsHdcnjG3RmCBQIaLB5nTkiY=; b=+HPfKfiXf5LrtArsxVDBAYFV33etp+P73fRU5PoMcm1QqVYgwxNGT35zlGurX7zH928DuH jIVTichOIYDEFnDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CKj9obhT5XwUS1+mmibYsHdcnjG3RmCBQIaLB5nTkiY=; b=rKnkqnYMwUvBCNfHyI+KUD7yYW/l8VvoSYM6kbyKQFo0GL4I4yaDLUvE9N7HOyL3N4qloG d8e4G/m5nwnOb9y1g1ofNbaTb5vgUW0F/hTRmtu7iPLO/XqpuI3qwEueL9vcX4fpRNJWEs HVham+H+5yp1Oh0XcKYsZn+F23dmsvU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CKj9obhT5XwUS1+mmibYsHdcnjG3RmCBQIaLB5nTkiY=; b=+HPfKfiXf5LrtArsxVDBAYFV33etp+P73fRU5PoMcm1QqVYgwxNGT35zlGurX7zH928DuH jIVTichOIYDEFnDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 11D781386E; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id +HH3Ar4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 06/12] ALSA: hda: cirrus: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:49 +0200 Message-ID: <20240506161359.6960-7-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-0.96 / 50.00]; BAYES_HAM(-1.17)[88.87%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.981]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -0.96 X-Spam-Flag: NO CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio cirrus codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_cirrus.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 6807b4708a17..654724559355 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -1128,7 +1128,6 @@ static int cs421x_parse_auto_config(struct hda_codec *codec) return 0; } -#ifdef CONFIG_PM /* * Manage PDREF, when transitioning to D3hot * (DAC,ADC) -> D3, PDREF=1, AFG->D3 @@ -1153,7 +1152,6 @@ static int cs421x_suspend(struct hda_codec *codec) return 0; } -#endif static const struct hda_codec_ops cs421x_patch_ops = { .build_controls = snd_hda_gen_build_controls, @@ -1161,9 +1159,7 @@ static const struct hda_codec_ops cs421x_patch_ops = { .init = cs421x_init, .free = cs_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .suspend = cs421x_suspend, -#endif }; static int patch_cs4210(struct hda_codec *codec) From patchwork Mon May 6 16:13:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655703 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08C19156227 for ; Mon, 6 May 2024 16:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=Ci49pA1A5wjnmT2ffmZAs/42xALDrk4Tl6OyE73xKoePGYKCu4CBNAnPGtxjMayhwkbE48iqcEvkTo1ZnMUofRM4L3pycxMP5UjHH4/deZJquPasmFP46wCkFrBVLRVxqXC69lL5KlAUOe89vdrSeB19KOeZHqgSub/b1ghcg4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=PXHSpTUw8infV+NjRzYlJhgwNzlkySHgY547OxXkZB8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XkHzWzh4Id0bOK7WgufDkJXz6At5TotqriI41V30bzudQfjDyYQ5EIGFYktGki7oEsSHvQDKDtRxsnQvSYosahFfL0lFY7ytCEVg+sXwTTGaKVhtdN9tdDPeqgLnC4OVy/SlB5sgpcgS6F3gDmk46TnkCngw/RNuAKL+A5CPjYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=OKkCuWp3; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RVCKs7fJ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=OKkCuWp3; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RVCKs7fJ; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="OKkCuWp3"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RVCKs7fJ"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="OKkCuWp3"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RVCKs7fJ" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5385A1F7A1; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cn/D8BIRRKSy5LYhC7gXWSuuc+R2c3Gp74+FKrHIF+k=; b=OKkCuWp3K0zYji2xyP6a64QrCLfm295r7nPVKafS3pgoAQsn2K14UPdjRv3PVIZkF9QDTJ sPKJHClV9LV8De2YKjP/ozEW8hejAPJbJ5qDehzdsITFzcEDkGrpm1PpwzPOvQdYgXCcoY hBxaeDALJOEgl7frmyYc61uzDo9I8IA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cn/D8BIRRKSy5LYhC7gXWSuuc+R2c3Gp74+FKrHIF+k=; b=RVCKs7fJJdHmUMY90YupxdH5Wo3qFqwJF/43T0oY8nqPxefG0Xb79cml0kxTh/cdjSYu6G cgSgDEXlNXxYPoCQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=OKkCuWp3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RVCKs7fJ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cn/D8BIRRKSy5LYhC7gXWSuuc+R2c3Gp74+FKrHIF+k=; b=OKkCuWp3K0zYji2xyP6a64QrCLfm295r7nPVKafS3pgoAQsn2K14UPdjRv3PVIZkF9QDTJ sPKJHClV9LV8De2YKjP/ozEW8hejAPJbJ5qDehzdsITFzcEDkGrpm1PpwzPOvQdYgXCcoY hBxaeDALJOEgl7frmyYc61uzDo9I8IA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cn/D8BIRRKSy5LYhC7gXWSuuc+R2c3Gp74+FKrHIF+k=; b=RVCKs7fJJdHmUMY90YupxdH5Wo3qFqwJF/43T0oY8nqPxefG0Xb79cml0kxTh/cdjSYu6G cgSgDEXlNXxYPoCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3832A13A31; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id qIlYDL4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 07/12] ALSA: hda: conexant: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:50 +0200 Message-ID: <20240506161359.6960-8-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-0.89 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.88)[85.74%]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Flag: NO X-Spam-Score: -0.89 X-Spamd-Bar: / X-Rspamd-Queue-Id: 5385A1F7A1 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio conexant codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_conexant.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index e8209178d87b..17389a3801bd 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -294,13 +294,11 @@ static void cx_jack_unsol_event(struct hda_codec *codec, unsigned int res) snd_hda_jack_unsol_event(codec, res); } -#ifdef CONFIG_PM static int cx_auto_suspend(struct hda_codec *codec) { cx_auto_shutdown(codec); return 0; } -#endif static const struct hda_codec_ops cx_auto_patch_ops = { .build_controls = snd_hda_gen_build_controls, @@ -308,10 +306,8 @@ static const struct hda_codec_ops cx_auto_patch_ops = { .init = cx_auto_init, .free = cx_auto_free, .unsol_event = cx_jack_unsol_event, -#ifdef CONFIG_PM .suspend = cx_auto_suspend, .check_power_status = snd_hda_gen_check_power_status, -#endif }; /* From patchwork Mon May 6 16:13:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655702 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F54F15622E for ; Mon, 6 May 2024 16:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; cv=none; b=dNMT+rj0YNDv3EkuzAv1vQ/TyJowYH57LE88oNd9UmQJLmaM+hI9MKseI5zZzUj33Hw2YBWQESB8Fv4F8ynLIEW4Y8p0sZ7qcHXzimwVbs1P3KuKjKSyk1kTqViqS42M5qYXDDZnzpQmu1cuP3qsEntmjHDkR9na9bUFciuvd70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012033; c=relaxed/simple; bh=Zi0bqHJLBNAHq6Uam/jDRGwR/HhQYhmceR0EZW2GcDY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EhjzeumdxjZAJmXn3MAFYHE1Q9Z0Fk8DLKmk+CuA2fLJk4ofWFjKLQa907lvYX7tGPoPC+o4oGaSBF8voTxXhh10dlEWpBXcQ6Z7CLgHh133dIVzB8thrrN1pHqwZLQG72mvPizCogs9NERo/DvR7wIya35lXVKvVeayHwYhBkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jxoN1ae1; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5ySvnVx6; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=jxoN1ae1; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5ySvnVx6; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jxoN1ae1"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5ySvnVx6"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="jxoN1ae1"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5ySvnVx6" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7B4D71F7A3; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgqfZWt5W+QjAsrLv46CEkTzmpwrLBHNSucsy6lt6ZY=; b=jxoN1ae1Qgc/LYSnNjbZhXpWW4N3hZ5kZRWsYTt94GOkYtW66Dy9LTJMx7rSTL9m2BB3Hg VXRdiGgeEMjMmqpNJnjANkj7MQCxILWaIKAgrr2cQyz2KxQOQdyZ676psgKV7axKSQAaa9 /e8TMJCPlFZbhoz7kDQ7W1L8MlF3bJg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgqfZWt5W+QjAsrLv46CEkTzmpwrLBHNSucsy6lt6ZY=; b=5ySvnVx6j80LsTaPpKOX83yRt9OAR9KNIUlGxF6KbmrWT3NKS4nXi2fwBqgW9GTDNzQSbq 8wsOPWO+Q2WxDADg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jxoN1ae1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5ySvnVx6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgqfZWt5W+QjAsrLv46CEkTzmpwrLBHNSucsy6lt6ZY=; b=jxoN1ae1Qgc/LYSnNjbZhXpWW4N3hZ5kZRWsYTt94GOkYtW66Dy9LTJMx7rSTL9m2BB3Hg VXRdiGgeEMjMmqpNJnjANkj7MQCxILWaIKAgrr2cQyz2KxQOQdyZ676psgKV7axKSQAaa9 /e8TMJCPlFZbhoz7kDQ7W1L8MlF3bJg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgqfZWt5W+QjAsrLv46CEkTzmpwrLBHNSucsy6lt6ZY=; b=5ySvnVx6j80LsTaPpKOX83yRt9OAR9KNIUlGxF6KbmrWT3NKS4nXi2fwBqgW9GTDNzQSbq 8wsOPWO+Q2WxDADg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5EFC41386E; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4L/SFL4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 08/12] ALSA: hda: cs4809: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:51 +0200 Message-ID: <20240506161359.6960-9-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-1.59 / 50.00]; BAYES_HAM(-1.58)[92.31%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 7B4D71F7A3 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Score: -1.59 CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio generic cs8409 driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_cs8409.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index e41316e2e983..26f3c31600d7 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -909,7 +909,6 @@ static void cs42l42_resume(struct sub_codec *cs42l42) cs42l42_enable_jack_detect(cs42l42); } -#ifdef CONFIG_PM static void cs42l42_suspend(struct sub_codec *cs42l42) { struct hda_codec *codec = cs42l42->codec; @@ -948,7 +947,6 @@ static void cs42l42_suspend(struct sub_codec *cs42l42) spec->gpio_data &= ~cs42l42->reset_gpio; snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA, spec->gpio_data); } -#endif static void cs8409_free(struct hda_codec *codec) { @@ -1003,7 +1001,6 @@ static void cs8409_cs42l42_jack_unsol_event(struct hda_codec *codec, unsigned in } } -#ifdef CONFIG_PM /* Manage PDREF, when transition to D3hot */ static int cs8409_cs42l42_suspend(struct hda_codec *codec) { @@ -1025,7 +1022,6 @@ static int cs8409_cs42l42_suspend(struct hda_codec *codec) return 0; } -#endif /* Vendor specific HW configuration * PLL, ASP, I2C, SPI, GPIOs, DMIC etc... @@ -1080,9 +1076,7 @@ static const struct hda_codec_ops cs8409_cs42l42_patch_ops = { .init = cs8409_init, .free = cs8409_free, .unsol_event = cs8409_cs42l42_jack_unsol_event, -#ifdef CONFIG_PM .suspend = cs8409_cs42l42_suspend, -#endif }; static int cs8409_cs42l42_exec_verb(struct hdac_device *dev, unsigned int cmd, unsigned int flags, @@ -1310,9 +1304,7 @@ static const struct hda_codec_ops cs8409_dolphin_patch_ops = { .init = cs8409_init, .free = cs8409_free, .unsol_event = dolphin_jack_unsol_event, -#ifdef CONFIG_PM .suspend = cs8409_cs42l42_suspend, -#endif }; static int dolphin_exec_verb(struct hdac_device *dev, unsigned int cmd, unsigned int flags, From patchwork Mon May 6 16:13:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655707 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AE1B156642 for ; Mon, 6 May 2024 16:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012037; cv=none; b=d8ZxEWisSqtO8lRpS4e1Vub9C1SdAXHKiy7I/Ay+tQOCso1edEalOcRlPdHJnX9GtJPTfJMx+NM9aTRfhqiMYFlMO17RZQxYBAGl9vsd7l8/If97GawN0AED84pc9s3wBN59oYfnE+bYLS3nK9zU0TZRsuUm9hBQqlHQvRmcRlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012037; c=relaxed/simple; bh=sqkvpVNjD83vtU0gk9MkzQyfQbmw3zKAJEOqQaVMfvE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=biLZr6tDZdBRQgvINa+pWFJAq07oHwQn2+Gp9Fn42bPWIlIh6SEDP7xFE+7+dNAHLD2Qrxp5hLUccxDFY/aRluk58RDau0VtV0BuykXApRUO69ZjDtpt+sSbIIF5xMaaHPU0jOjhgWjF0yVrga7nox9eS2yhrYSIywOpqXa7OFo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=u99oct3l; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Ky6Cxd8b; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=u99oct3l; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Ky6Cxd8b; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="u99oct3l"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Ky6Cxd8b"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="u99oct3l"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Ky6Cxd8b" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9A3961F7A4; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd9zgezS9Fe0AxPd2/Wf1A4NlSKjKFIeTQ1fxfwMUNE=; b=u99oct3lLG+d6PpFoqin1Q1hp1029ZAxypcsgXKcOaDwELdaJMPTWmsbZJn1qgYS+aCIan Cf5JZTQWMmlMeHv6XeBOPjl7+iLJ6y8a+F/z9jZL/PgZKhPxhUw4CkcN1IQd2qkdODonW/ bhIDGXQile6WSr1cgIClCeM/7pOFFbw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd9zgezS9Fe0AxPd2/Wf1A4NlSKjKFIeTQ1fxfwMUNE=; b=Ky6Cxd8bPW0IWd5XRuUYH1OnpOJcLZABcAQsgbSWRv59cvQQrOsQ7w2Km2o9jyuvUbwQ4R H4enQtRtissROGAQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=u99oct3l; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Ky6Cxd8b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd9zgezS9Fe0AxPd2/Wf1A4NlSKjKFIeTQ1fxfwMUNE=; b=u99oct3lLG+d6PpFoqin1Q1hp1029ZAxypcsgXKcOaDwELdaJMPTWmsbZJn1qgYS+aCIan Cf5JZTQWMmlMeHv6XeBOPjl7+iLJ6y8a+F/z9jZL/PgZKhPxhUw4CkcN1IQd2qkdODonW/ bhIDGXQile6WSr1cgIClCeM/7pOFFbw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd9zgezS9Fe0AxPd2/Wf1A4NlSKjKFIeTQ1fxfwMUNE=; b=Ky6Cxd8bPW0IWd5XRuUYH1OnpOJcLZABcAQsgbSWRv59cvQQrOsQ7w2Km2o9jyuvUbwQ4R H4enQtRtissROGAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 81DA313A31; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id cG9hHr4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 09/12] ALSA: hda: hdmi: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:52 +0200 Message-ID: <20240506161359.6960-10-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-0.56 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.55)[80.90%]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Flag: NO X-Spam-Score: -0.56 X-Spamd-Bar: / X-Rspamd-Queue-Id: 9A3961F7A4 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio HDMI codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_hdmi.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 495d63101186..b2c42cd54351 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2513,7 +2513,6 @@ static void generic_hdmi_free(struct hda_codec *codec) generic_spec_free(codec); } -#ifdef CONFIG_PM static int generic_hdmi_suspend(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -2540,7 +2539,6 @@ static int generic_hdmi_resume(struct hda_codec *codec) } return 0; } -#endif static const struct hda_codec_ops generic_hdmi_patch_ops = { .init = generic_hdmi_init, @@ -2548,10 +2546,8 @@ static const struct hda_codec_ops generic_hdmi_patch_ops = { .build_pcms = generic_hdmi_build_pcms, .build_controls = generic_hdmi_build_controls, .unsol_event = hdmi_unsol_event, -#ifdef CONFIG_PM .suspend = generic_hdmi_suspend, .resume = generic_hdmi_resume, -#endif }; static const struct hdmi_ops generic_standard_hdmi_ops = { @@ -2952,7 +2948,6 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec, } } -#ifdef CONFIG_PM static int i915_adlp_hdmi_suspend(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -3032,7 +3027,6 @@ static int i915_adlp_hdmi_resume(struct hda_codec *codec) return res; } -#endif /* precondition and allocation for Intel codecs */ static int alloc_intel_hdmi(struct hda_codec *codec) @@ -3167,10 +3161,8 @@ static int patch_i915_adlp_hdmi(struct hda_codec *codec) if (spec->silent_stream_type) { spec->silent_stream_type = SILENT_STREAM_KAE; -#ifdef CONFIG_PM codec->patch_ops.resume = i915_adlp_hdmi_resume; codec->patch_ops.suspend = i915_adlp_hdmi_suspend; -#endif } } From patchwork Mon May 6 16:13:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655705 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AE5F156643 for ; Mon, 6 May 2024 16:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012036; cv=none; b=S9r+ZRxOhCmA7MvtPnNRUQIUcW9ihiN5ZkXH4To282Uupg5in5Oa/TZneZF4DCCSvlVS/a6C16tpL3cDxv05mWwc+yRgZmW8PVWHUwv/3rO13xbLdx4MkaTOdD8xrVo43cseRr0MpBpCpBdLR4TnseCHjMGy+LYWVLUqlJk+0PA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012036; c=relaxed/simple; bh=1vfSO4HUc253jOFMG2JUcyjYDmEzV3OGLZW9KJuw2vU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cV5hl0WTjLJNW1+iaRw7UrnFAnVi8DgV3t0ohIRwTqzsuR2epiQo5wf01FwG6AOATNlFiUO6RDpopNhDTXP70ieEG8v83RYtUVQakHBBw2KtTcuvKyq3O7A1WzSZcdQdwl+Ln4SG5aIifVftQyZaEKDoZtScEq4fUJadBFjvGA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=mqaEBzNn; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Hm/0s+Eb; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=mqaEBzNn; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Hm/0s+Eb; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="mqaEBzNn"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Hm/0s+Eb"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="mqaEBzNn"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Hm/0s+Eb" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BB5D91F7A5; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bNIazqfjwaZcu4LMvun5yJR6mHT4Fge2aRxt+zexqyE=; b=mqaEBzNniklciG+DMjassXAeoTIf8vKeNwpDsNHbDoXS2usclSxwOxAJD0ZUZZnDhNLtOu spEto7LQ7Z1i7YBxo+qeD6Z9hxQffXv1GRMFiZdjf0Iyrhigrke5sgeCWjOrYm0pERe/iZ C7CnyzJfWHZzsfZetiVF/ogrypasjPk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bNIazqfjwaZcu4LMvun5yJR6mHT4Fge2aRxt+zexqyE=; b=Hm/0s+EbsqTSGiTj4voBX2a9uOtXrrcu7RZ97oQ4zp3JW8WvJ9OGxGzldk688GlxfvwM4M QzFJxRvdTr5aTYCw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mqaEBzNn; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="Hm/0s+Eb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bNIazqfjwaZcu4LMvun5yJR6mHT4Fge2aRxt+zexqyE=; b=mqaEBzNniklciG+DMjassXAeoTIf8vKeNwpDsNHbDoXS2usclSxwOxAJD0ZUZZnDhNLtOu spEto7LQ7Z1i7YBxo+qeD6Z9hxQffXv1GRMFiZdjf0Iyrhigrke5sgeCWjOrYm0pERe/iZ C7CnyzJfWHZzsfZetiVF/ogrypasjPk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bNIazqfjwaZcu4LMvun5yJR6mHT4Fge2aRxt+zexqyE=; b=Hm/0s+EbsqTSGiTj4voBX2a9uOtXrrcu7RZ97oQ4zp3JW8WvJ9OGxGzldk688GlxfvwM4M QzFJxRvdTr5aTYCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A076C1386E; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id mDsBJr4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 10/12] ALSA: hda: realtek: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:53 +0200 Message-ID: <20240506161359.6960-11-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: BB5D91F7A5 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Score: -3.01 CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio realtek codec driver, too. Simply drop CONFIG_PM ifdefs. A superfluous __maybe_unused attribute was dropped as well. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_realtek.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b29739bd330b..944f36f94a5a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -109,9 +109,7 @@ struct alc_spec { /* hooks */ void (*init_hook)(struct hda_codec *codec); -#ifdef CONFIG_PM void (*power_hook)(struct hda_codec *codec); -#endif void (*shutup)(struct hda_codec *codec); int init_amp; @@ -947,7 +945,6 @@ static int alc_init(struct hda_codec *codec) #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; @@ -986,7 +983,6 @@ static int alc_resume(struct hda_codec *codec) hda_call_check_power_status(codec, 0x01); return 0; } -#endif /* */ @@ -996,11 +992,9 @@ static const struct hda_codec_ops alc_patch_ops = { .init = alc_init, .free = alc_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .resume = alc_resume, .suspend = alc_suspend, .check_power_status = snd_hda_gen_check_power_status, -#endif }; @@ -4041,7 +4035,6 @@ static void alc5505_dsp_init(struct hda_codec *codec) #define alc5505_dsp_resume(codec) alc5505_dsp_back_from_halt(codec) #endif -#ifdef CONFIG_PM static int alc269_suspend(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; @@ -4087,7 +4080,6 @@ static int alc269_resume(struct hda_codec *codec) return 0; } -#endif /* CONFIG_PM */ static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec, const struct hda_fixup *fix, int action) @@ -7204,7 +7196,7 @@ static void alc287_alc1318_playback_pcm_hook(struct hda_pcm_stream *hinfo, } } -static void __maybe_unused alc287_s4_power_gpio3_default(struct hda_codec *codec) +static void alc287_s4_power_gpio3_default(struct hda_codec *codec) { if (is_s4_suspend(codec)) { alc_write_coef_idx(codec, 0x10, 0x8806); /* Change MLK to GPIO3 */ @@ -7219,9 +7211,7 @@ static void alc287_fixup_lenovo_thinkpad_with_alc1318(struct hda_codec *codec, if (action != HDA_FIXUP_ACT_PRE_PROBE) return; -#ifdef CONFIG_PM spec->power_hook = alc287_s4_power_gpio3_default; -#endif spec->gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook; } @@ -11287,10 +11277,8 @@ static int patch_alc269(struct hda_codec *codec) codec->power_save_node = 0; spec->en_3kpull_low = true; -#ifdef CONFIG_PM codec->patch_ops.suspend = alc269_suspend; codec->patch_ops.resume = alc269_resume; -#endif spec->shutup = alc_default_shutup; spec->init_hook = alc_default_init; @@ -11588,9 +11576,7 @@ static int patch_alc861(struct hda_codec *codec) if (has_cdefine_beep(codec)) spec->gen.beep_nid = 0x23; -#ifdef CONFIG_PM spec->power_hook = alc_power_eapd; -#endif alc_pre_init(codec); From patchwork Mon May 6 16:13:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655706 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1A5515664A for ; Mon, 6 May 2024 16:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012036; cv=none; b=FfVbOIVZoK8P3kKS5+w14x029qZk4/SNXiePWH7YhNq5+vL7zIU0u1pk1LfDvtf44TL8w7bwt9pn5c/TpaDWhqqmo/d/op5aHoWjKzKioMgInFrJpldWRszGrwQ5nsvZoBZVCwRPsmadGLcBeUd4ZCEE4RloYAaYxpLVmroAUX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012036; c=relaxed/simple; bh=bMUfQomdSV1OXpHR/lG3ngxhDfWm801K0HGxF3thVac=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dCXbonlhtniZD7Z4eWAZ7DZZOOX0XAXhRLE1BrExMqCvNPMOkBuTv6Gru8axyKZJk9R1T6Jsxm2XVK0d5xz9werfb2KSTHqBwqNEIRUaWlmIuKRpNgdsfyS1iSOd1xgWRcE7Sbb4QiQZmV4l9l1rCYV3LvVn+yGmQZX173TpCkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=aIohjfVG; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=wVIvaDVb; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=aIohjfVG; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=wVIvaDVb; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="aIohjfVG"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="wVIvaDVb"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="aIohjfVG"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="wVIvaDVb" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D9C081F7A7; Mon, 6 May 2024 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTlCPr+UKpUyJhdtRIoU/J0tJTzNnnbT6NG75eNN6pM=; b=aIohjfVG2hJZW1lAcKF44udmAZ9sYJCEaOAC4u32DJfYueAmsDpm/woPCUNcL49ITQJj2o xeBbpIzMjhU73bwJLGLF3n/1igJzskHP43Y9kzh6vm1Wy01OujXHXl4F6CkdPjgT6SLd7a ywPn3BFJOqTa32btyZtfZpd2QypTHjc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTlCPr+UKpUyJhdtRIoU/J0tJTzNnnbT6NG75eNN6pM=; b=wVIvaDVbkk80WaYdOze3wcMB5DTrJDyjMmyvI42MubouiWHdKS3L7m45tYk1MfK34v59QF dMc2Gp7tikmnqIDw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=aIohjfVG; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=wVIvaDVb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTlCPr+UKpUyJhdtRIoU/J0tJTzNnnbT6NG75eNN6pM=; b=aIohjfVG2hJZW1lAcKF44udmAZ9sYJCEaOAC4u32DJfYueAmsDpm/woPCUNcL49ITQJj2o xeBbpIzMjhU73bwJLGLF3n/1igJzskHP43Y9kzh6vm1Wy01OujXHXl4F6CkdPjgT6SLd7a ywPn3BFJOqTa32btyZtfZpd2QypTHjc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012030; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTlCPr+UKpUyJhdtRIoU/J0tJTzNnnbT6NG75eNN6pM=; b=wVIvaDVbkk80WaYdOze3wcMB5DTrJDyjMmyvI42MubouiWHdKS3L7m45tYk1MfK34v59QF dMc2Gp7tikmnqIDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C10FC13A31; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id iPzULb4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 11/12] ALSA: hda: sigmantel: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:54 +0200 Message-ID: <20240506161359.6960-12-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-0.43 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; BAYES_HAM(-0.42)[78.25%]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Flag: NO X-Spam-Score: -0.43 X-Spamd-Bar: / X-Rspamd-Queue-Id: D9C081F7A7 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio sigmatel codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_sigmatel.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 61258b0aac8d..ae1a34c68c61 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -2154,10 +2154,8 @@ static void stac92hd83xxx_fixup_hp_mic_led(struct hda_codec *codec, if (action == HDA_FIXUP_ACT_PRE_PROBE) { spec->mic_mute_led_gpio = 0x08; /* GPIO3 */ -#ifdef CONFIG_PM /* resetting controller clears GPIO, so we need to keep on */ codec->core.power_caps &= ~AC_PWRST_CLKSTOP; -#endif } } @@ -4442,7 +4440,6 @@ static void stac927x_proc_hook(struct snd_info_buffer *buffer, #define stac927x_proc_hook NULL #endif -#ifdef CONFIG_PM static int stac_suspend(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; @@ -4456,9 +4453,6 @@ static int stac_suspend(struct hda_codec *codec) return 0; } -#else -#define stac_suspend NULL -#endif /* CONFIG_PM */ static const struct hda_codec_ops stac_patch_ops = { .build_controls = snd_hda_gen_build_controls, @@ -4466,9 +4460,7 @@ static const struct hda_codec_ops stac_patch_ops = { .init = stac_init, .free = stac_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .suspend = stac_suspend, -#endif }; static int alloc_stac_spec(struct hda_codec *codec) From patchwork Mon May 6 16:13:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13655704 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA5CC156230 for ; Mon, 6 May 2024 16:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012034; cv=none; b=huOZEZij08cAM9w8Zm5c79h9CqiKqgUwnKMdE1UnbqMS3k2aCHQbvAGsLqyEcOGe5xIQyA9EGzRDwPWG2YTuoI8V0gWhL9L3ZxacvTJgtmQAN863WbT2EEbK3fjlVrCXnoEhoo4hW+G9YH15HqHyRUWZQzHMtzsjrzuMjIk20YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715012034; c=relaxed/simple; bh=HPlLJypHEQYHMkj2+GdCpZsENfmcQqkziuibdDmvTsY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oCbLoaHG/AKNa5jin46hbntZ5s9dgA13N00j/Pvckmv4dE+7cXsGZJ4w7iCmRLhU00Uvpn2c4Id3wXudUudtS0T2AW9u8nIDXwIispL4O6VP6pey5/HsAKWq8D9wFK7QBdrI59eCmTTMawSxWkqeDV6x0w1VpILkRXCNecR7TFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=vyraP0TE; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=B2S6MAv2; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=vyraP0TE; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=B2S6MAv2; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="vyraP0TE"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="B2S6MAv2"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="vyraP0TE"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="B2S6MAv2" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 01DF4385E3; Mon, 6 May 2024 16:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012031; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A6igZx2nDiQyQ6p37W2PMbkn56U2TI6741Wxphapbbc=; b=vyraP0TEGxrEh4jT2+nVVsC8Yx/SaSvvQ8PotWRTLuDl35FHx5gDzOwv8+TlWywYPM5UCw MEoLVjAQe93AF8sc+5RRfptlzT/dKy7yBWo+GemitRXJ4yikc1N+UtXuqlBkGWhwwfEeVD jUpV+P6BIS7h4Im6fq9y5QQv843FwJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012031; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A6igZx2nDiQyQ6p37W2PMbkn56U2TI6741Wxphapbbc=; b=B2S6MAv28OcknPDxwhBBvRvC5zQXMc3FGxrO5FZx8/x2OdPd7zQNdLJ2exq4Sh41T0AfJ+ 2bRZCP51dJfmPHDw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vyraP0TE; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=B2S6MAv2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715012031; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A6igZx2nDiQyQ6p37W2PMbkn56U2TI6741Wxphapbbc=; b=vyraP0TEGxrEh4jT2+nVVsC8Yx/SaSvvQ8PotWRTLuDl35FHx5gDzOwv8+TlWywYPM5UCw MEoLVjAQe93AF8sc+5RRfptlzT/dKy7yBWo+GemitRXJ4yikc1N+UtXuqlBkGWhwwfEeVD jUpV+P6BIS7h4Im6fq9y5QQv843FwJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715012031; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A6igZx2nDiQyQ6p37W2PMbkn56U2TI6741Wxphapbbc=; b=B2S6MAv28OcknPDxwhBBvRvC5zQXMc3FGxrO5FZx8/x2OdPd7zQNdLJ2exq4Sh41T0AfJ+ 2bRZCP51dJfmPHDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DEE061386E; Mon, 6 May 2024 16:13:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id eIE1Nb4BOWbwFQAAD6G6ig (envelope-from ); Mon, 06 May 2024 16:13:50 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 12/12] ALSA: hda: via: Reduce CONFIG_PM dependencies Date: Mon, 6 May 2024 18:13:55 +0200 Message-ID: <20240506161359.6960-13-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240506161359.6960-1-tiwai@suse.de> References: <20240506161359.6960-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Spamd-Result: default: False [-0.93 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.92)[86.28%]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 01DF4385E3 X-Spam-Flag: NO X-Spam-Score: -0.93 X-Spamd-Bar: / CONFIG_PM dependencies got reduced in HD-audio codec core driver, and now it's time to reduce in HD-audio via codec driver, too. Simply drop CONFIG_PM ifdefs. Signed-off-by: Takashi Iwai --- sound/pci/hda/patch_via.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 2994f85bc1b9..a8ef4bb70dd0 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -379,7 +379,6 @@ static void via_free(struct hda_codec *codec) snd_hda_gen_free(codec); } -#ifdef CONFIG_PM static int via_suspend(struct hda_codec *codec) { struct via_spec *spec = codec->spec; @@ -400,9 +399,7 @@ static int via_resume(struct hda_codec *codec) snd_hda_regmap_sync(codec); return 0; } -#endif -#ifdef CONFIG_PM static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid) { struct via_spec *spec = codec->spec; @@ -410,7 +407,6 @@ static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid) vt1708_update_hp_work(codec); return snd_hda_check_amp_list_power(codec, &spec->gen.loopback, nid); } -#endif /* */ @@ -423,11 +419,9 @@ static const struct hda_codec_ops via_patch_ops = { .init = via_init, .free = via_free, .unsol_event = snd_hda_jack_unsol_event, -#ifdef CONFIG_PM .suspend = via_suspend, .resume = via_resume, .check_power_status = via_check_power_status, -#endif };