From patchwork Thu Mar 13 17:07:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015511 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 461A5250EC for ; Thu, 13 Mar 2025 17:07:39 +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=1741885661; cv=none; b=B9MMSaKijpCIEcwXLZHZwguadXPDVSI6034367hpZ2xePZB8qpgF/p19AGklfOHlY/xeaQ9yi809XVYzZ8JzQuKcd43RO/02CEJV5b4j2QKPtyjiirF23H1iG3wHI8jD1PFtwJhvRbJ5HNGNlSG9zcjUm965yjbO/i4AJ7zVsHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885661; c=relaxed/simple; bh=VfccZbqgbqHU5PyPyodD6QxWoPnbVisKf7xDo9h2wfk=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=USqTv5wyMOx7Wjhm7hxbAoH3X3yIyDaGIV9O2i3QSUXiq2di5ikbONW2zmPkruoMGa++eGoYAYIG63FHeQTeROqQSLMp9UkL93eP2WZzdG/zIjz2TEYU/sfz6NA/+Dp6jR76qciOQSUXWcP37V1s/wuEeBHlCiRqjmDEXHFVbcg= 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=SEaNGgad; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=VVRQsO3b; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=SEaNGgad; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=VVRQsO3b; 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="SEaNGgad"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="VVRQsO3b"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="SEaNGgad"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="VVRQsO3b" 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 324C91F457; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=0tIdmW8IFTW50t8F1isJIl1dsKmb8Cju1daVpQl1gys=; b=SEaNGgadBSYHXspUpNGwAjce7LTQdj5iEaTvLeOHViMv+G4Io7RstS2wCYuTvDmjrjCUY/ 7WUG4rWpGro48GKXI3cYGaktDAsHbFyHDZePgQ2WlIWF1QojMxHBDhSp5hoDWNVJCdmWTO 5KuipxactEgL3tCuiKCCaPWR+gDyaIA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=0tIdmW8IFTW50t8F1isJIl1dsKmb8Cju1daVpQl1gys=; b=VVRQsO3bYe4ujCJEKBhaKi6ZGoo2yrIQwrXrghjE6UWmU0xosWtjTrZJXx/cX4npcjGqlc gnC3uZyTXFQjZqBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=SEaNGgad; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=VVRQsO3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=0tIdmW8IFTW50t8F1isJIl1dsKmb8Cju1daVpQl1gys=; b=SEaNGgadBSYHXspUpNGwAjce7LTQdj5iEaTvLeOHViMv+G4Io7RstS2wCYuTvDmjrjCUY/ 7WUG4rWpGro48GKXI3cYGaktDAsHbFyHDZePgQ2WlIWF1QojMxHBDhSp5hoDWNVJCdmWTO 5KuipxactEgL3tCuiKCCaPWR+gDyaIA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=0tIdmW8IFTW50t8F1isJIl1dsKmb8Cju1daVpQl1gys=; b=VVRQsO3bYe4ujCJEKBhaKi6ZGoo2yrIQwrXrghjE6UWmU0xosWtjTrZJXx/cX4npcjGqlc gnC3uZyTXFQjZqBw== 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 14C70139D2; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aL/oA9gQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 1/9] ALSA: ac97: Convert to RUNTIME_PM_OPS() macro Date: Thu, 13 Mar 2025 18:07:19 +0100 Message-ID: <20250313170731.26943-2-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Queue-Id: 324C91F457 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Flag: NO Use a newer RUNTIME_PM_OPS() macro instead of SET_RUNTIME_PM_OPS() together with pm_ptr(), which makes CONFIG_PM ifdefs superfluous. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai --- sound/ac97/bus.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 8dfffdc101a2..47c6787158a7 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -387,7 +387,6 @@ void snd_ac97_controller_unregister(struct ac97_controller *ac97_ctrl) } EXPORT_SYMBOL_GPL(snd_ac97_controller_unregister); -#ifdef CONFIG_PM static int ac97_pm_runtime_suspend(struct device *dev) { struct ac97_codec_device *codec = to_ac97_device(dev); @@ -419,7 +418,6 @@ static int ac97_pm_runtime_resume(struct device *dev) return pm_generic_runtime_resume(dev); } -#endif /* CONFIG_PM */ static const struct dev_pm_ops ac97_pm = { .suspend = pm_generic_suspend, @@ -428,10 +426,7 @@ static const struct dev_pm_ops ac97_pm = { .thaw = pm_generic_thaw, .poweroff = pm_generic_poweroff, .restore = pm_generic_restore, - SET_RUNTIME_PM_OPS( - ac97_pm_runtime_suspend, - ac97_pm_runtime_resume, - NULL) + RUNTIME_PM_OPS(ac97_pm_runtime_suspend, ac97_pm_runtime_resume, NULL) }; static int ac97_get_enable_clk(struct ac97_codec_device *adev) @@ -535,7 +530,7 @@ const struct bus_type ac97_bus_type = { .name = "ac97bus", .dev_groups = ac97_dev_groups, .match = ac97_bus_match, - .pm = &ac97_pm, + .pm = pm_ptr(&ac97_pm), .probe = ac97_bus_probe, .remove = ac97_bus_remove, }; From patchwork Thu Mar 13 17:07:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015513 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 1D9661552EB for ; Thu, 13 Mar 2025 17:07:45 +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=1741885667; cv=none; b=YrpnHfva4nOTrFsw2tqjkDfDmvefBEs4kwsRrKKfgyrk5+1j4+a7JA+NoMLzzJU8fxAYw5cAVdKivf3nQ3GOFwjNYX+h2xW1JsdU56QjTVqcQPF6YK/F0UQ0+9cBaRr9xBmLNW+IkzFN+i8dE2ayhfu12+P0leB5uPJK0Lyzf3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885667; c=relaxed/simple; bh=DN2WNxJQi3mwZcFRkYgYDHAwiy6eEnjrKyQOzMsXApo=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jd/Ov7K7PxNGUherx75VmKyckiYR7DqzuwWoSC3TQfj0UbP1PjA2AoV7oMy7ckUG3JGCpj5j/wLnKhg7hfgPSdprQq5EMOrraDvQQT6SzcqQ38XwH9NEWHgTrKaS3FiLnkSuTR9bvEIc/OMKa+GI8wl/yKpa6nTBuWVlgYLPEqc= 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=xhOZ9UvS; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=jnApzyTT; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xhOZ9UvS; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=jnApzyTT; 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="xhOZ9UvS"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="jnApzyTT"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xhOZ9UvS"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="jnApzyTT" 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 4FCDC1F76B; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=qLCIgmURgEbP6zwj6aMCg/Te9dyi+yrjpoT0SiUH7ek=; b=xhOZ9UvSrQF6wqK7H3S/Tzc4xUnX/z/mlTMgieq4c0yJjfPPv+iU3Dg4c6Ie9h1lKaLhLf jv2BzfxA3wL+yuJ870JGrq3yos8EyRmtYnEYVCoSFXZjuLffXGpJsZpDcUILDch3KMVPYk gFgsqFd3CH18eGeF2ozypyrWvkxLBqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=qLCIgmURgEbP6zwj6aMCg/Te9dyi+yrjpoT0SiUH7ek=; b=jnApzyTTUMJwpNwdowgc5VSyXd3WHZUZs+SeojBCQUZvYKvY16xf5HCXtOmZxpYmy68fvS SPYf0wvmaAvASKCw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=xhOZ9UvS; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jnApzyTT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=qLCIgmURgEbP6zwj6aMCg/Te9dyi+yrjpoT0SiUH7ek=; b=xhOZ9UvSrQF6wqK7H3S/Tzc4xUnX/z/mlTMgieq4c0yJjfPPv+iU3Dg4c6Ie9h1lKaLhLf jv2BzfxA3wL+yuJ870JGrq3yos8EyRmtYnEYVCoSFXZjuLffXGpJsZpDcUILDch3KMVPYk gFgsqFd3CH18eGeF2ozypyrWvkxLBqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=qLCIgmURgEbP6zwj6aMCg/Te9dyi+yrjpoT0SiUH7ek=; b=jnApzyTTUMJwpNwdowgc5VSyXd3WHZUZs+SeojBCQUZvYKvY16xf5HCXtOmZxpYmy68fvS SPYf0wvmaAvASKCw== 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 3506C13A24; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OA7CC9gQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 2/9] ALSA: atmel: Convert to DEFINE_SIMPLE_DEV_PM_OPS() macro Date: Thu, 13 Mar 2025 18:07:20 +0100 Message-ID: <20250313170731.26943-3-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Queue-Id: 4FCDC1F76B X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: Use the newer DEFINE_SIMPLE_DEV_PM_OPS() macro instead of SIMPLE_DEV_PM_OPS() together with pm_ptr(), which makes CONFIG_PM_SLEEP ifdefs superfluous. Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai --- sound/atmel/ac97c.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index d8f8e08f1bb7..84e264f335ca 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -817,7 +817,6 @@ static int atmel_ac97c_probe(struct platform_device *pdev) return retval; } -#ifdef CONFIG_PM_SLEEP static int atmel_ac97c_suspend(struct device *pdev) { struct snd_card *card = dev_get_drvdata(pdev); @@ -836,11 +835,7 @@ static int atmel_ac97c_resume(struct device *pdev) return ret; } -static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume); -#define ATMEL_AC97C_PM_OPS &atmel_ac97c_pm -#else -#define ATMEL_AC97C_PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume); static void atmel_ac97c_remove(struct platform_device *pdev) { @@ -864,7 +859,7 @@ static struct platform_driver atmel_ac97c_driver = { .remove = atmel_ac97c_remove, .driver = { .name = "atmel_ac97c", - .pm = ATMEL_AC97C_PM_OPS, + .pm = pm_ptr(&atmel_ac97c_pm), .of_match_table = atmel_ac97c_dt_ids, }, }; From patchwork Thu Mar 13 17:07:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015512 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 C89FE153801 for ; Thu, 13 Mar 2025 17:07:44 +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=1741885666; cv=none; b=mVG62/4pYzQhWFJ3nSpRN/0LKTE/geY4VDex2dSr889Z+B+QrCd0aQrTkVOaB2Emwf4kkmMQOKVKjdpwD6n+r+exHRBMuHBck3Meux6bfUcVO3Vr6u0ivekacuVphdVqeP2yLXMTkmcNmPQk+zyx1qbdN7280RyINFHDHl5BQLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885666; c=relaxed/simple; bh=ZUkqT/YWBpw8oIE2jehGvxc65nbetWfWiXPK83au8hg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hckiqTukFi47uT7/tw5xu9/hG217j3DTq3g8b9DkUgGXRG2W537FuKWq2o6eqpfratiEzSRuQ+fRUuLfgMeNmtak6M/tvCHWDIxvGBT5GnJbPQCMZH7sz2IkYMhdXovOWk9neja8eIKMv1TBu0VnH0lUrR7YDI/3ZSvtW0MbnYY= 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=PlfDBfq8; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=dm3NpdXQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=PlfDBfq8; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=dm3NpdXQ; 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="PlfDBfq8"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="dm3NpdXQ"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="PlfDBfq8"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="dm3NpdXQ" Received: from imap1.dmz-prg2.suse.org (unknown [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 6EB6F21188; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=B1ClED/Kw3FmmgxAGCDVHLV5YB1e2T2RKEzNIpscAmM=; b=PlfDBfq8WrsRRQmZcfeo7u7yrYxeVnDAgrIz435voDDqIJg+9vfbetePJAeABJuq70EUcL lHs0FacQnLe+xuOp/3CrOZ+ffVYXmU3VKBfAVdqLFgwhaD7T7AMb3rznpBCDYSwEVtAnwY tSXCa1n7RHjyhHdBk8oWH8kaeClAxOg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=B1ClED/Kw3FmmgxAGCDVHLV5YB1e2T2RKEzNIpscAmM=; b=dm3NpdXQDj8xa7WARb3piHkhnr5wEB71Ja5hNCajHYlPDyQuoA6C1etJWBRaBxwGOWFURP nHW+rNFhUQjZWbAg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=B1ClED/Kw3FmmgxAGCDVHLV5YB1e2T2RKEzNIpscAmM=; b=PlfDBfq8WrsRRQmZcfeo7u7yrYxeVnDAgrIz435voDDqIJg+9vfbetePJAeABJuq70EUcL lHs0FacQnLe+xuOp/3CrOZ+ffVYXmU3VKBfAVdqLFgwhaD7T7AMb3rznpBCDYSwEVtAnwY tSXCa1n7RHjyhHdBk8oWH8kaeClAxOg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=B1ClED/Kw3FmmgxAGCDVHLV5YB1e2T2RKEzNIpscAmM=; b=dm3NpdXQDj8xa7WARb3piHkhnr5wEB71Ja5hNCajHYlPDyQuoA6C1etJWBRaBxwGOWFURP nHW+rNFhUQjZWbAg== 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 54A1913797; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id wKV8E9gQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 3/9] ALSA: pcm: Convert to SYSTEM_SLEEP_PM_OPS() Date: Thu, 13 Mar 2025 18:07:21 +0100 Message-ID: <20250313170731.26943-4-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of SET_SYSTEM_SLEEP_PM_OPS(), which makes CONFIG_PM_SLEEP ifdefs superfluous. Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai --- sound/core/pcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 290690fc2abc..283aac441fa0 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -592,7 +592,6 @@ static const struct attribute_group *pcm_dev_attr_groups[]; * PM callbacks: we need to deal only with suspend here, as the resume is * triggered either from user-space or the driver's resume callback */ -#ifdef CONFIG_PM_SLEEP static int do_pcm_suspend(struct device *dev) { struct snd_pcm_str *pstr = dev_get_drvdata(dev); @@ -601,10 +600,9 @@ static int do_pcm_suspend(struct device *dev) snd_pcm_suspend_all(pstr->pcm); return 0; } -#endif static const struct dev_pm_ops pcm_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(do_pcm_suspend, NULL) + SYSTEM_SLEEP_PM_OPS(do_pcm_suspend, NULL) }; /* device type for PCM -- basically only for passing PM callbacks */ From patchwork Thu Mar 13 17:07:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015515 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 9E877155326 for ; Thu, 13 Mar 2025 17:07:53 +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=1741885675; cv=none; b=Oa31Cf27dHIk1MLbT9Bq2kwr+zVMR98hn05RHwib+UYjajVYkd5P1RQDg3QYAtIs93PVIZW4mjCElDPDjWSXtPirrS8ztPza9ryIKcCQ+jU0n09hZVpGe+LU1sZ9dqE8FFMkv7n6FPmvidyYq5lIhWwMJAAHpzpLqTcAZSnqNaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885675; c=relaxed/simple; bh=a3iLUE40JqOvMXTreaoujDf0sLjJw0v+yjQvNOgQILc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aC+kSzTdEHkHmxXG9GqYrk3tWjn+2gh24KLNFCK97LRkkBayBQlfbDRj22mwLYuwsr6CVflsbScJbcbMfjkZtsY17k9GnKEYZZRFQGNKULXohHq+cK/wdZC4HwZzjCuNKBjVRuRR822IxtUmr9NeLCuTtkdoU0wIwVrTEGGaLpw= 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=D/Mp3618; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=8EZyi3cQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=D/Mp3618; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=8EZyi3cQ; 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="D/Mp3618"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="8EZyi3cQ"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="D/Mp3618"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="8EZyi3cQ" Received: from imap1.dmz-prg2.suse.org (unknown [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 8E59B1F76C; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=5WRl/zIqOdycq7yxDxjiicOF7k0Z/chtS5wTHE/udvM=; b=D/Mp3618etcxe3MO5xs2Ww9X1kUR5jnkBfnYXrl0Uo1fNmZO1nKunUSEuJjNlCyXTx0dGH yJ3HjFKydSTCS05H3NaKSG3P4XWLed1qwWXwXhIXcvxRd+XBIedTbDHZDhwZh23brEAAPB 0adiEy7lvWSHisZhZj8VZxr1IZHA8aY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=5WRl/zIqOdycq7yxDxjiicOF7k0Z/chtS5wTHE/udvM=; b=8EZyi3cQ7LUekqHMVZ+2GXkPaquZYezLOAAkI5Y4t7KeSL1/lfijce7MKzgcTq/quvmCLD odMNSN/K6sgDloDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=5WRl/zIqOdycq7yxDxjiicOF7k0Z/chtS5wTHE/udvM=; b=D/Mp3618etcxe3MO5xs2Ww9X1kUR5jnkBfnYXrl0Uo1fNmZO1nKunUSEuJjNlCyXTx0dGH yJ3HjFKydSTCS05H3NaKSG3P4XWLed1qwWXwXhIXcvxRd+XBIedTbDHZDhwZh23brEAAPB 0adiEy7lvWSHisZhZj8VZxr1IZHA8aY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=5WRl/zIqOdycq7yxDxjiicOF7k0Z/chtS5wTHE/udvM=; b=8EZyi3cQ7LUekqHMVZ+2GXkPaquZYezLOAAkI5Y4t7KeSL1/lfijce7MKzgcTq/quvmCLD odMNSN/K6sgDloDQ== 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 74529139D2; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iOs0G9gQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 4/9] ALSA: hda: Use RUNTIME_PM_OPS() and pm_ptr() Date: Thu, 13 Mar 2025 18:07:22 +0100 Message-ID: <20250313170731.26943-5-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Score: -2.80 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Level: Clean up the code with the helper macros, and also assure that no PM ops is assigned without CONFIG_PM via pm_ptr(). Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_bind.c | 2 +- sound/pci/hda/hda_codec.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index b7ca2a83fbb0..9521e5e0e6e6 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -185,7 +185,7 @@ int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name, drv->core.driver.probe = hda_codec_driver_probe; drv->core.driver.remove = hda_codec_driver_remove; drv->core.driver.shutdown = hda_codec_driver_shutdown; - drv->core.driver.pm = &hda_codec_driver_pm; + drv->core.driver.pm = pm_ptr(&hda_codec_driver_pm); drv->core.type = HDA_DEV_LEGACY; drv->core.match = hda_codec_match; drv->core.unsol_event = hda_codec_unsol_event; diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 14763c0f31ad..b9bce583476e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3037,8 +3037,7 @@ const struct dev_pm_ops hda_codec_driver_pm = { .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), + RUNTIME_PM_OPS(hda_codec_runtime_suspend, hda_codec_runtime_resume, NULL) }; /* suspend the codec at shutdown; called from driver's shutdown callback */ From patchwork Thu Mar 13 17:07:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015514 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 C9DAE26A08D for ; Thu, 13 Mar 2025 17:07:50 +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=1741885672; cv=none; b=fSLn1hLFoJK60/NpsqWcUHJkHSZmQxpP3VNOnbJXsn37T4kZZbQ8OjzYq8fFviDZLVDmM94FsQ99D4F1TlfrsNFgcOAomcjEfPxpZ8vBK5vNG5r14Wz9azspqvGTMdtjNFVs74nBq8MLS3rvlxSDhllllmtRxTyp8PR/r/Lp/EA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885672; c=relaxed/simple; bh=yWh8onOsUP+msLCgKqQTFCoUleraxwGOCtZOmzYim1M=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPE5icac+RxXqdBzCfgSOcMgeHezNulOfhEwiNS1lIeo48oH+CE5lYhwHf58aYL7TJLff8iJM8BbKGRtKVOfAchrqtBK++KC+M1pdEhISXkzyiUDdxTgpsNpaZ5izuXFr8dCZNeuktqsd+2ALXlEK3Hru8+YMtL1hHG69LrNvJg= 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=WFWqpt1M; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0revYGCT; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=WFWqpt1M; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0revYGCT; 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="WFWqpt1M"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0revYGCT"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="WFWqpt1M"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0revYGCT" Received: from imap1.dmz-prg2.suse.org (unknown [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 ADAF821189; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=jvt2hXDQpTiH1eaBRFxi87qlpn106cpNfZDGUPR/Ls0=; b=WFWqpt1MNJ24pG7AhHwe1igNwb8+JUgibWxIa73wLYpQQZ8pHnRywy9y+M2EcIiPs9703Z h59DmZ86foLcLO+1SesaVZGOdNijO1y2X/E7pD634P/MkaH7eeW9pP/1EOkHVrWH/BFTr9 GtL60QiQEwUpgWXO2LPUDe8k4yD2TYY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=jvt2hXDQpTiH1eaBRFxi87qlpn106cpNfZDGUPR/Ls0=; b=0revYGCTAKIL3jpbXnpzkYxRNfbR0fY2MZkKtsNKsYv3r205UNdZ+aL6dVWBunX30ukQM5 UweEL6M+WydY75Ag== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=jvt2hXDQpTiH1eaBRFxi87qlpn106cpNfZDGUPR/Ls0=; b=WFWqpt1MNJ24pG7AhHwe1igNwb8+JUgibWxIa73wLYpQQZ8pHnRywy9y+M2EcIiPs9703Z h59DmZ86foLcLO+1SesaVZGOdNijO1y2X/E7pD634P/MkaH7eeW9pP/1EOkHVrWH/BFTr9 GtL60QiQEwUpgWXO2LPUDe8k4yD2TYY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=jvt2hXDQpTiH1eaBRFxi87qlpn106cpNfZDGUPR/Ls0=; b=0revYGCTAKIL3jpbXnpzkYxRNfbR0fY2MZkKtsNKsYv3r205UNdZ+aL6dVWBunX30ukQM5 UweEL6M+WydY75Ag== 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 9435013797; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id AIboItgQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 5/9] ALSA: hda-intel: Convert to RUNTIME_PM_OPS() Date: Thu, 13 Mar 2025 18:07:23 +0100 Message-ID: <20250313170731.26943-6-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Use the newer RUNTIME_PM_OPS() macro instead of SET_RUNTIME_PM_OPS() together with pm_ptr(), which allows us dropping ugly __maybe_unused attributes. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_intel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3f11f169fe4a..62ee32f70adc 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1051,7 +1051,7 @@ static int azx_suspend(struct device *dev) return 0; } -static int __maybe_unused azx_resume(struct device *dev) +static int azx_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1098,7 +1098,7 @@ static int azx_thaw_noirq(struct device *dev) return 0; } -static int __maybe_unused azx_runtime_suspend(struct device *dev) +static int azx_runtime_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1115,7 +1115,7 @@ static int __maybe_unused azx_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused azx_runtime_resume(struct device *dev) +static int azx_runtime_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1132,7 +1132,7 @@ static int __maybe_unused azx_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused azx_runtime_idle(struct device *dev) +static int azx_runtime_idle(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1163,7 +1163,7 @@ static const struct dev_pm_ops azx_pm = { .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) + RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) }; @@ -2795,7 +2795,7 @@ static struct pci_driver azx_driver = { .remove = azx_remove, .shutdown = azx_shutdown, .driver = { - .pm = &azx_pm, + .pm = pm_ptr(&azx_pm), }, }; From patchwork Thu Mar 13 17:07:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015516 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 3BA40155326 for ; Thu, 13 Mar 2025 17:07:57 +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=1741885679; cv=none; b=gkW5d795Y1sXR2jm6Xj640kE3TxU9rre6n/pWvWOWLtYmuW/NRcN2Bxf215yE6E0TANWeJg1fqQozDtgjsGZK+1laaKfFW4+VDmNlHe2Z9BO08rSnIrlFc9WT6YGcAGvO6E3XjJuNmDDIr51J9IZoaj5/nC2S0SqgUbWFeoTGvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885679; c=relaxed/simple; bh=3dAzkpUIjvHSab7xnOJWs5BoQFMfaQnkTpSF/y5qCf0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KadiUCRg5iWH8JWtbmQ1hzbERRoiSPKSl0PaQj5H81xOkoMjQZGf7zGlm29xgR/LY3KL3EOEvwOu4cXZHGTiMZuici8lM57C4RmJYmwXOoaNqNUdc6zH9+G7XRmp73ctVVzwRVI/51NFEBp8yCHYnL9txegQGHLq7fmUbzcTUtU= 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=CnZIRgyc; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=P4RMKMcs; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=CnZIRgyc; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=P4RMKMcs; 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="CnZIRgyc"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="P4RMKMcs"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="CnZIRgyc"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="P4RMKMcs" 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 DCEDB211B8; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=BE1y6q2JYYvOuXEG6XM9SJHTFF9kXiW8NBPthsiJuqw=; b=CnZIRgycP/Kk4bJVK2E0wtlg1E9eZyINn82egc9iUlV6HWxnlP1wpVg/1Xb+LC1bB2R+Pp 6KLjQ402Lcs+PEoHG8HOR6eixWyLSorm8dsGbLi7HqfFnz1Az8n76qoFdv+PZaUclXURcU AsSFH2tmsBY8ofZhOYfulN/+dAmSbYQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=BE1y6q2JYYvOuXEG6XM9SJHTFF9kXiW8NBPthsiJuqw=; b=P4RMKMcsb0CdV4a+i/u7p9+9EJ+iJ04mh2ABWSDpOmRAUXcABhiaHYSdpaMwsEMm2QmWbQ q+T5knGgCwYj9JDg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=CnZIRgyc; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=P4RMKMcs DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885656; 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=BE1y6q2JYYvOuXEG6XM9SJHTFF9kXiW8NBPthsiJuqw=; b=CnZIRgycP/Kk4bJVK2E0wtlg1E9eZyINn82egc9iUlV6HWxnlP1wpVg/1Xb+LC1bB2R+Pp 6KLjQ402Lcs+PEoHG8HOR6eixWyLSorm8dsGbLi7HqfFnz1Az8n76qoFdv+PZaUclXURcU AsSFH2tmsBY8ofZhOYfulN/+dAmSbYQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885656; 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=BE1y6q2JYYvOuXEG6XM9SJHTFF9kXiW8NBPthsiJuqw=; b=P4RMKMcsb0CdV4a+i/u7p9+9EJ+iJ04mh2ABWSDpOmRAUXcABhiaHYSdpaMwsEMm2QmWbQ q+T5knGgCwYj9JDg== 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 B3240139D2; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gN91KtgQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 6/9] ALSA: hda/tegra: Convert to RUNTIME_PM_OPS() & co Date: Thu, 13 Mar 2025 18:07:24 +0100 Message-ID: <20250313170731.26943-7-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Queue-Id: DCEDB211B8 X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: Use the newer RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() macros instead of SET_SET_RUNTIME_PM_OPS() and SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us dropping ugly __maybe_unused attributes. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_tegra.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index b1e30a83dfb0..a590d431c5ff 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -125,7 +125,7 @@ static void hda_tegra_init(struct hda_tegra *hda) /* * power management */ -static int __maybe_unused hda_tegra_suspend(struct device *dev) +static int hda_tegra_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); int rc; @@ -138,7 +138,7 @@ static int __maybe_unused hda_tegra_suspend(struct device *dev) return 0; } -static int __maybe_unused hda_tegra_resume(struct device *dev) +static int hda_tegra_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); int rc; @@ -151,7 +151,7 @@ static int __maybe_unused hda_tegra_resume(struct device *dev) return 0; } -static int __maybe_unused hda_tegra_runtime_suspend(struct device *dev) +static int hda_tegra_runtime_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; @@ -170,7 +170,7 @@ static int __maybe_unused hda_tegra_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused hda_tegra_runtime_resume(struct device *dev) +static int hda_tegra_runtime_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; @@ -204,10 +204,8 @@ static int __maybe_unused hda_tegra_runtime_resume(struct device *dev) } static const struct dev_pm_ops hda_tegra_pm = { - SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume) - SET_RUNTIME_PM_OPS(hda_tegra_runtime_suspend, - hda_tegra_runtime_resume, - NULL) + SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume) + RUNTIME_PM_OPS(hda_tegra_runtime_suspend, hda_tegra_runtime_resume, NULL) }; static int hda_tegra_dev_disconnect(struct snd_device *device) @@ -602,7 +600,7 @@ static void hda_tegra_shutdown(struct platform_device *pdev) static struct platform_driver tegra_platform_hda = { .driver = { .name = "tegra-hda", - .pm = &hda_tegra_pm, + .pm = pm_ptr(&hda_tegra_pm), .of_match_table = hda_tegra_match, }, .probe = hda_tegra_probe, From patchwork Thu Mar 13 17:07:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015517 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 E6D3D155326 for ; Thu, 13 Mar 2025 17:07:59 +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=1741885681; cv=none; b=LpI8k7qVc5672Tl552Jwl6eKY8Yxf4g+ZQPAY9llyHh3ovgpc4zW8QhsnV8nmxzo5l4pTpfzJx8US3ZnugHh2M7g1WkQt127B4fiukUPNu3WoBHFK6hNhE8s2dHCoEb80V5MizoP0VtbAXwSpue/H8qOat9KhuMUusFBjz3TnM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885681; c=relaxed/simple; bh=XH79BDLmIeEqxXmYdk6HTL/u7NVxYAoQARfVxoQWm2U=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bHSdTtnGFZpXswmmhbfc+LtCNvHOAPib5/7+Hi5j5RqBuACj4UtlLC5lyGe3dMkQhJYc2LR9hht6Grzxqpmtg3PUlpLZ8PFV3j5XHQ1yMLS00YKNgd4Gg3sDFjhb7bCBRcwZgrye+xFrR+o5uUGwj7XNuKRMlHPHVuoAzExz4VQ= 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=UZ9TrXlb; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=w12K0oKN; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=UZ9TrXlb; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=w12K0oKN; 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="UZ9TrXlb"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="w12K0oKN"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="UZ9TrXlb"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="w12K0oKN" 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 0BCB71F770; Thu, 13 Mar 2025 17:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=cSyOyjszspfEgzpa0YroeyzqkOC53RjWpc/xORUX+IQ=; b=UZ9TrXlby4yI6zzGX1qJ922WV7h99oZXBtsciFr/ZWwFQwfjlLJwNaYCTCRDlUsLEmu0gt VmgqavwlZ4pp8rF07jEPf0dPqagZ9nWTxr7LdIyQ0tjW66VzvU7qg+4K8LHlYjWQjALKnt WtwANyS6On329CSofCQ1MdWGniGghdw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=cSyOyjszspfEgzpa0YroeyzqkOC53RjWpc/xORUX+IQ=; b=w12K0oKN3cPCu5Tlk3ZWxluJyn7fHOZCzlO5Fdne3y12E6/GZcu717jf34zOSLji6UxXRf /CufzgYEn5Rm/vBg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=UZ9TrXlb; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=w12K0oKN DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=cSyOyjszspfEgzpa0YroeyzqkOC53RjWpc/xORUX+IQ=; b=UZ9TrXlby4yI6zzGX1qJ922WV7h99oZXBtsciFr/ZWwFQwfjlLJwNaYCTCRDlUsLEmu0gt VmgqavwlZ4pp8rF07jEPf0dPqagZ9nWTxr7LdIyQ0tjW66VzvU7qg+4K8LHlYjWQjALKnt WtwANyS6On329CSofCQ1MdWGniGghdw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=cSyOyjszspfEgzpa0YroeyzqkOC53RjWpc/xORUX+IQ=; b=w12K0oKN3cPCu5Tlk3ZWxluJyn7fHOZCzlO5Fdne3y12E6/GZcu717jf34zOSLji6UxXRf /CufzgYEn5Rm/vBg== 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 E23CE13797; Thu, 13 Mar 2025 17:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IK8ONtgQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:36 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 7/9] ALSA: oxygen: Convert to EXPORT_SIMPLE_DEV_PM_OPS() Date: Thu, 13 Mar 2025 18:07:25 +0100 Message-ID: <20250313170731.26943-8-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Queue-Id: 0BCB71F770 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Flag: NO Use the newer EXPORT_SIMPLE_DEV_PM_OPS() macro instead of SIPLE_DEV_PM_OPS() and manual export, together with pm_ptr() macro, which makes CONFIG_PM_SLEEP ifdefs superfluous. Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai --- sound/pci/oxygen/oxygen.c | 4 +--- sound/pci/oxygen/oxygen.h | 2 -- sound/pci/oxygen/oxygen_lib.c | 5 +---- sound/pci/oxygen/se6x.c | 4 +--- sound/pci/oxygen/virtuoso.c | 4 +--- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index c346f42befc2..6d0deea47ee6 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -854,11 +854,9 @@ static struct pci_driver oxygen_driver = { .name = KBUILD_MODNAME, .id_table = oxygen_ids, .probe = generic_oxygen_probe, -#ifdef CONFIG_PM_SLEEP .driver = { - .pm = &oxygen_pci_pm, + .pm = pm_ptr(&oxygen_pci_pm), }, -#endif }; module_pci_driver(oxygen_driver); diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 0cae640708f3..820026daf838 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h @@ -161,9 +161,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, const struct pci_device_id *id ) ); -#ifdef CONFIG_PM_SLEEP extern const struct dev_pm_ops oxygen_pci_pm; -#endif void oxygen_pci_shutdown(struct pci_dev *pci); /* oxygen_mixer.c */ diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 92ffe9dc20c5..9340d3c9ffd6 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c @@ -713,7 +713,6 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, } EXPORT_SYMBOL(oxygen_pci_probe); -#ifdef CONFIG_PM_SLEEP static int oxygen_pci_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); @@ -789,9 +788,7 @@ static int oxygen_pci_resume(struct device *dev) return 0; } -SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume); -EXPORT_SYMBOL(oxygen_pci_pm); -#endif /* CONFIG_PM_SLEEP */ +EXPORT_SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume); void oxygen_pci_shutdown(struct pci_dev *pci) { diff --git a/sound/pci/oxygen/se6x.c b/sound/pci/oxygen/se6x.c index 17650a5b1bfa..c1bb9dd1cd54 100644 --- a/sound/pci/oxygen/se6x.c +++ b/sound/pci/oxygen/se6x.c @@ -137,11 +137,9 @@ static struct pci_driver se6x_driver = { .name = KBUILD_MODNAME, .id_table = se6x_ids, .probe = se6x_probe, -#ifdef CONFIG_PM_SLEEP .driver = { - .pm = &oxygen_pci_pm, + .pm = pm_ptr(&oxygen_pci_pm), }, -#endif .shutdown = oxygen_pci_shutdown, }; diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 2e405133371f..0bfe6d8dde3e 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -82,11 +82,9 @@ static struct pci_driver xonar_driver = { .name = KBUILD_MODNAME, .id_table = xonar_ids, .probe = xonar_probe, -#ifdef CONFIG_PM_SLEEP .driver = { - .pm = &oxygen_pci_pm, + .pm = pm_ptr(&oxygen_pci_pm), }, -#endif .shutdown = oxygen_pci_shutdown, }; From patchwork Thu Mar 13 17:07:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015518 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 7FE4C269AE6 for ; Thu, 13 Mar 2025 17:08:04 +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=1741885686; cv=none; b=AQarKoUM9jy944DyMfuAjuzGWczeV5U9vyDQfmILqtvAdRwSGDTbagnXweb+CHE3TPPdsIVRdiFFe+Z3NyvF3FUVd9laO1TrRdj93Qq6ZKn7lVxHXYp0HfM4Qs4sFJcG/8R7bOvSVKkMJR2Us+iKi9ikLii5nyK7j75i0+JIOx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885686; c=relaxed/simple; bh=O/2pjy3caht/eRp14YugfQBYwgyo7A36Z959K0PDTtc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ecWAU8wh/fVR/pYjbdkYgmEB4hO/C0cFapYm7GrD4Czw+4C9i4zYSj/w5qrgIA426MSdugBS760FlXdNem4YVC1wdlrJRhFMYbQqkJH87Pziw4IwXn7beDF+kY3biqB/jfEvNayyKplIUSJ9zop4ej8CLAGUrw7vHDfVShLsdxU= 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=wzFuPlXb; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=D1IIzbVO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=wzFuPlXb; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=D1IIzbVO; 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="wzFuPlXb"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="D1IIzbVO"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="wzFuPlXb"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="D1IIzbVO" Received: from imap1.dmz-prg2.suse.org (unknown [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 2B6E5211BF; Thu, 13 Mar 2025 17:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=wxi2Ldr2u5AQn9M4NE3ra5sfPIza4BjjEG15cn0c8kY=; b=wzFuPlXbymkJZLYiKjH/xnb3S/EZlaM8VqYZTFdKzWlRCGskfQDIGw+mxtqEwhOmJyTtjx 1xsfmFKK5A7M1yj/UazqL3vV3XyIexteFMUg8ruCrJF7TeBSmqo10jtXxCye0qIykFT7Zk uF8k3Ggkz5fBawc+G/fnRh7t2WUPWdo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=wxi2Ldr2u5AQn9M4NE3ra5sfPIza4BjjEG15cn0c8kY=; b=D1IIzbVOE8pdPw31TiHsQE9p/Sp5B7nChSjyj6vqC2wQykMlBr/DCL2tOYZ3ioMqXLUik8 Nz+bKFjXaSXBbADQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=wxi2Ldr2u5AQn9M4NE3ra5sfPIza4BjjEG15cn0c8kY=; b=wzFuPlXbymkJZLYiKjH/xnb3S/EZlaM8VqYZTFdKzWlRCGskfQDIGw+mxtqEwhOmJyTtjx 1xsfmFKK5A7M1yj/UazqL3vV3XyIexteFMUg8ruCrJF7TeBSmqo10jtXxCye0qIykFT7Zk uF8k3Ggkz5fBawc+G/fnRh7t2WUPWdo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=wxi2Ldr2u5AQn9M4NE3ra5sfPIza4BjjEG15cn0c8kY=; b=D1IIzbVOE8pdPw31TiHsQE9p/Sp5B7nChSjyj6vqC2wQykMlBr/DCL2tOYZ3ioMqXLUik8 Nz+bKFjXaSXBbADQ== 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 11A37139D2; Thu, 13 Mar 2025 17:07:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QLgTA9kQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:37 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 8/9] ALSA: vx222: Convert to DEFINE_SIMPLE_DEV_PM_OPS() Date: Thu, 13 Mar 2025 18:07:26 +0100 Message-ID: <20250313170731.26943-9-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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-Score: -2.80 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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Level: Use the newer DEFINE_SIMPLE_DEV_PM_OPS() macro instead of SIMPLE_DEV_PM_OPS() together with pm_ptr(), which makes CONFIG_PM_SLEEP ifdefs superfluous. Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai --- sound/pci/vx222/vx222.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index 468a6a20dc1e..fdb039896205 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c @@ -204,7 +204,6 @@ static int snd_vx222_probe(struct pci_dev *pci, return 0; } -#ifdef CONFIG_PM_SLEEP static int snd_vx222_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); @@ -221,18 +220,14 @@ static int snd_vx222_resume(struct device *dev) return snd_vx_resume(&vx->core); } -static SIMPLE_DEV_PM_OPS(snd_vx222_pm, snd_vx222_suspend, snd_vx222_resume); -#define SND_VX222_PM_OPS &snd_vx222_pm -#else -#define SND_VX222_PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(snd_vx222_pm, snd_vx222_suspend, snd_vx222_resume); static struct pci_driver vx222_driver = { .name = KBUILD_MODNAME, .id_table = snd_vx222_ids, .probe = snd_vx222_probe, .driver = { - .pm = SND_VX222_PM_OPS, + .pm = pm_ptr(&snd_vx222_pm), }, }; From patchwork Thu Mar 13 17:07:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 14015519 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 D639B15748F for ; Thu, 13 Mar 2025 17:08:05 +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=1741885687; cv=none; b=ZCwTXOeVqBti5t4tf+WJvClWhvhaToFfEwPBc8jy9DXmXX+UfYy5YavWMFOUlZ49AOgx26/6sHnIWWPJIq7qNQVz5ZnlcrfSIgKzh9R2gGESnbN+ezpoTsECA0vISkfkHmJbOP6sh6PDQmHub91WyAe6xyAmuI4HMTy7nOWOBco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741885687; c=relaxed/simple; bh=hOddHI8wBa7MHUBXCYQGAdjw49wHbyMwm/WfuDUXUKc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OJmuURCymOlISsJDDR9GiiF2VsMnkL+wKO68S62u2HmbyIeTXlSivEmKTCveILmi+PFQUG1Snhk7KLmqd9fu2pK0Fb2y2+NND2PctV2ZWJQlaNHKsb/cWFbcwyq7VxkIWGxZNNe0ek5mLwc8ryVdkJT/SoIvmsI2kvKl9sxMPSk= 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=oVaz/FX3; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=av6Qvjqr; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oVaz/FX3; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=av6Qvjqr; 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="oVaz/FX3"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="av6Qvjqr"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oVaz/FX3"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="av6Qvjqr" Received: from imap1.dmz-prg2.suse.org (unknown [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 5541A1F786; Thu, 13 Mar 2025 17:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=W8ZWZo0UZhF4YB7OSeiqMLZnrUSNvOsG0pX3ImaUuUE=; b=oVaz/FX3H/FKAWOskXCrGirOLpWn9HdBs1fGdYv5eJP8A7jv/KrOgr9U7gIAEa4PBaqoIL vPSONKk7HctlWtZ0qicn8eApKeq6LAoO1QV/v+azB5kFydmZAxWcaJgUs1td82WMMKUyMX mLbj2WHqcu95l2fHHBDyDFO1Wvuy+OA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=W8ZWZo0UZhF4YB7OSeiqMLZnrUSNvOsG0pX3ImaUuUE=; b=av6QvjqrFyQbcykTzb9YOtbCQPxTWrSbnSK5837Fn7mcDWHU7ksHz9EgZMynbUTwL41EoI UsaOY1Ktdad0XuAg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741885657; 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=W8ZWZo0UZhF4YB7OSeiqMLZnrUSNvOsG0pX3ImaUuUE=; b=oVaz/FX3H/FKAWOskXCrGirOLpWn9HdBs1fGdYv5eJP8A7jv/KrOgr9U7gIAEa4PBaqoIL vPSONKk7HctlWtZ0qicn8eApKeq6LAoO1QV/v+azB5kFydmZAxWcaJgUs1td82WMMKUyMX mLbj2WHqcu95l2fHHBDyDFO1Wvuy+OA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741885657; 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=W8ZWZo0UZhF4YB7OSeiqMLZnrUSNvOsG0pX3ImaUuUE=; b=av6QvjqrFyQbcykTzb9YOtbCQPxTWrSbnSK5837Fn7mcDWHU7ksHz9EgZMynbUTwL41EoI UsaOY1Ktdad0XuAg== 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 3B48413797; Thu, 13 Mar 2025 17:07:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IEFMDNkQ02ciOgAAD6G6ig (envelope-from ); Thu, 13 Mar 2025 17:07:37 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Subject: [PATCH 9/9] ALSA: intel-hdmi-audio: Convert to SYSTEM_SLEEP_PM_OPS() Date: Thu, 13 Mar 2025 18:07:27 +0100 Message-ID: <20250313170731.26943-10-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313170731.26943-1-tiwai@suse.de> References: <20250313170731.26943-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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us dropping ugly __maybe_unused attributes. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai --- sound/x86/intel_hdmi_audio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index d41ea09ffbe5..7fcc528a0204 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1617,7 +1617,7 @@ static int had_create_jack(struct snd_intelhad *ctx, * PM callbacks */ -static int __maybe_unused hdmi_lpe_audio_suspend(struct device *dev) +static int hdmi_lpe_audio_suspend(struct device *dev) { struct snd_intelhad_card *card_ctx = dev_get_drvdata(dev); @@ -1626,7 +1626,7 @@ static int __maybe_unused hdmi_lpe_audio_suspend(struct device *dev) return 0; } -static int __maybe_unused hdmi_lpe_audio_resume(struct device *dev) +static int hdmi_lpe_audio_resume(struct device *dev) { struct snd_intelhad_card *card_ctx = dev_get_drvdata(dev); @@ -1833,13 +1833,13 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) } static const struct dev_pm_ops hdmi_lpe_audio_pm = { - SET_SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume) + SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume) }; static struct platform_driver hdmi_lpe_audio_driver = { .driver = { .name = "hdmi-lpe-audio", - .pm = &hdmi_lpe_audio_pm, + .pm = pm_ptr(&hdmi_lpe_audio_pm), }, .probe = hdmi_lpe_audio_probe, };