Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e2e46e8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pm' into acpi-fan

parents 6d0abeca fae9e2a4

drivers/acpi/ac.c

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ static int acpi_ac_resume(struct device *dev) 
		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

	return 0;

}

#else

#define acpi_ac_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);

drivers/acpi/battery.c

+2 −0
Original line number Diff line number Diff line
@@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) 
	acpi_battery_update(battery);

	return 0;

}

#else

#define acpi_battery_resume NULL

#endif



static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

drivers/acpi/button.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); 


#ifdef CONFIG_PM_SLEEP

static int acpi_button_resume(struct device *dev);

#else

#define acpi_button_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);

drivers/acpi/fan.c

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ MODULE_DEVICE_TABLE(acpi, fan_device_ids); 
#ifdef CONFIG_PM_SLEEP

static int acpi_fan_suspend(struct device *dev);

static int acpi_fan_resume(struct device *dev);

#else

#define acpi_fan_suspend NULL

#define acpi_fan_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);

drivers/acpi/sbs.c

+2 −0
Original line number Diff line number Diff line
@@ -668,6 +668,8 @@ static int acpi_sbs_resume(struct device *dev) 
	acpi_sbs_callback(sbs);

	return 0;

}

#else

#define acpi_sbs_resume NULL

#endif



static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);