linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Lee Jones <lee@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Paul Cercueil <paul@crapouillou.net>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org
Subject: [PATCH v3 05/28] mfd: mt6397-irq: Remove #ifdef guards for PM related functions
Date: Sun, 23 Oct 2022 10:48:29 +0100	[thread overview]
Message-ID: <20221023094852.8035-6-paul@crapouillou.net> (raw)
In-Reply-To: <20221023094852.8035-1-paul@crapouillou.net>

Use the new pm_sleep_ptr() macro to handle the .irq_set_wake() callback.

This macro allows the mt6397_irq_set_wake() function to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org

 drivers/mfd/mt6397-irq.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mfd/mt6397-irq.c b/drivers/mfd/mt6397-irq.c
index eff53fed8fe7..72f923e47752 100644
--- a/drivers/mfd/mt6397-irq.c
+++ b/drivers/mfd/mt6397-irq.c
@@ -54,7 +54,6 @@ static void mt6397_irq_enable(struct irq_data *data)
 	mt6397->irq_masks_cur[reg] |= BIT(shift);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int mt6397_irq_set_wake(struct irq_data *irq_data, unsigned int on)
 {
 	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(irq_data);
@@ -68,9 +67,6 @@ static int mt6397_irq_set_wake(struct irq_data *irq_data, unsigned int on)
 
 	return 0;
 }
-#else
-#define mt6397_irq_set_wake NULL
-#endif
 
 static struct irq_chip mt6397_irq_chip = {
 	.name = "mt6397-irq",
@@ -78,7 +74,7 @@ static struct irq_chip mt6397_irq_chip = {
 	.irq_bus_sync_unlock = mt6397_irq_sync_unlock,
 	.irq_enable = mt6397_irq_enable,
 	.irq_disable = mt6397_irq_disable,
-	.irq_set_wake = mt6397_irq_set_wake,
+	.irq_set_wake = pm_sleep_ptr(mt6397_irq_set_wake),
 };
 
 static void mt6397_irq_handle_reg(struct mt6397_chip *mt6397, int reg,
-- 
2.35.1


  parent reply	other threads:[~2022-10-23  9:50 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-23  9:48 [PATCH v3 00/28] mfd: Remove #ifdef guards for PM functions Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 01/28] mfd: 88pm80x: Remove #ifdef guards for PM related functions Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 02/28] mfd: aat2870: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 03/28] mfd: adp5520: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 04/28] mfd: max8925-i2c: " Paul Cercueil
2022-10-23  9:48 ` Paul Cercueil [this message]
2022-10-23  9:48 ` [PATCH v3 06/28] mfd: pcf50633: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 07/28] mfd: rc5t583-irq: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 08/28] mfd: stpmic1: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 09/28] mfd: ucb1x00: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 10/28] mfd: 88pm860x: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 11/28] mfd: mcp-sa11x0: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 12/28] mfd: sec: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 13/28] mfd: sm501: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 14/28] mfd: tc6387xb: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 15/28] mfd: tps6586x: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 16/28] mfd: wm8994: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 17/28] mfd: max77620: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 18/28] mfd: t7l66xb: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 19/28] mfd: arizona: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 20/28] mfd: max14577: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 21/28] mfd: max77686: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 22/28] mfd: motorola-cpcap: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 23/28] mfd: sprd-sc27xx: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 24/28] mfd: stmfx: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 25/28] mfd: stmpe: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 26/28] mfd: tc3589x: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 27/28] mfd: tc6393xb: " Paul Cercueil
2022-10-23  9:48 ` [PATCH v3 28/28] mfd: intel-lpss: " Paul Cercueil
2022-10-23 12:55   ` kernel test robot
2022-10-31 14:59     ` Lee Jones
2022-10-31 15:03       ` Nathan Chancellor
2022-10-31 15:11         ` Paul Cercueil
2022-10-31 15:43           ` Lee Jones
2022-10-31 15:53             ` Paul Cercueil
2022-11-01 10:27               ` Lee Jones
2022-11-07  9:44 ` [PATCH v3 00/28] mfd: Remove #ifdef guards for PM functions Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221023094852.8035-6-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=lee@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).