Drops #ifdef from code, and ensures that conditional code still compiles if power management is disabled. Resulting code is dropped from object file.
Signed-off-by: Guenter Roeck <[email protected]> --- drivers/hwmon/max6639.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 3e7b426..6080913 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -591,8 +591,7 @@ static int max6639_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_SLEEP -static int max6639_suspend(struct device *dev) +static int __pm max6639_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); @@ -603,7 +602,7 @@ static int max6639_suspend(struct device *dev) MAX6639_REG_GCONFIG, data | MAX6639_GCONFIG_STANDBY); } -static int max6639_resume(struct device *dev) +static int __pm max6639_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); @@ -613,7 +612,6 @@ static int max6639_resume(struct device *dev) return i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, data & ~MAX6639_GCONFIG_STANDBY); } -#endif /* CONFIG_PM_SLEEP */ static const struct i2c_device_id max6639_id[] = { {"max6639", 0}, @@ -622,15 +620,16 @@ static const struct i2c_device_id max6639_id[] = { MODULE_DEVICE_TABLE(i2c, max6639_id); -static const struct dev_pm_ops max6639_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(max6639_suspend, max6639_resume) +static const struct dev_pm_ops __pm max6639_pm_ops = { + .suspend = max6639_suspend, + .resume = max6639_resume, }; static struct i2c_driver max6639_driver = { .class = I2C_CLASS_HWMON, .driver = { .name = "max6639", - .pm = &max6639_pm_ops, + .pm = pm_ops_ptr(&max6639_pm_ops), }, .probe = max6639_probe, .remove = max6639_remove, -- 1.7.9.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
