Commit 52c9d719 authored by Paul Cercueil's avatar Paul Cercueil Committed by Lee Jones
Browse files

mfd: max8925-i2c: Remove #ifdef guards for PM related functions 



Use the new DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros
to handle the .suspend/.resume callbacks.

These macros allow the suspend and resume functions 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: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 5745a90a

drivers/mfd/max8925-i2c.c

+3 −4
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ static void max8925_remove(struct i2c_client *client) 
	i2c_unregister_device(chip->rtc);

}



#ifdef CONFIG_PM_SLEEP

static int max8925_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);
@@ -226,9 +225,9 @@ static int max8925_resume(struct device *dev) 
		disable_irq_wake(chip->core_irq);

	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(max8925_pm_ops, max8925_suspend, max8925_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(max8925_pm_ops,

				max8925_suspend, max8925_resume);



static const struct of_device_id max8925_dt_ids[] = {

	{ .compatible = "maxim,max8925", },
@@ -238,7 +237,7 @@ static const struct of_device_id max8925_dt_ids[] = { 
static struct i2c_driver max8925_driver = {

	.driver	= {

		.name	= "max8925",

		.pm     = &max8925_pm_ops,

		.pm     = pm_sleep_ptr(&max8925_pm_ops),

		.of_match_table = max8925_dt_ids,

	},

	.probe_new	= max8925_probe,