iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI / PM: Fix unused function warnings for CONFIG_PM_SLEEP

Browse Source 
According to compiler warnings, several suspend/resume functions
in ACPI drivers are not used for CONFIG_PM_SLEEP unset, so add
#ifdefs to prevent them from being built in that case.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki
2012-08-09 23:00:02 +02:00
parent 300d3739e8
commit 9069240480
7 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/ac.c
View File

@ -69,7 +69,9 @@ static const struct acpi_device_id ac_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, ac_device_ids); MODULE_DEVICE_TABLE(acpi, ac_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_ac_resume(struct device *dev); static int acpi_ac_resume(struct device *dev);
#endif
static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume); static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);
static struct acpi_driver acpi_ac_driver = { static struct acpi_driver acpi_ac_driver = {
@ -313,6 +315,7 @@ static int acpi_ac_add(struct acpi_device *device)
return result; return result;
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_ac_resume(struct device *dev) static int acpi_ac_resume(struct device *dev)
{ {
struct acpi_ac *ac; struct acpi_ac *ac;
@ -332,6 +335,7 @@ static int acpi_ac_resume(struct device *dev)
kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
return 0; return 0;
} }
#endif
static int acpi_ac_remove(struct acpi_device *device, int type) static int acpi_ac_remove(struct acpi_device *device, int type)
{ {

2
drivers/acpi/battery.c
View File

@ -1052,6 +1052,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
/* this is needed to learn about changes made in suspended state */ /* this is needed to learn about changes made in suspended state */
static int acpi_battery_resume(struct device *dev) static int acpi_battery_resume(struct device *dev)
{ {
@ -1068,6 +1069,7 @@ static int acpi_battery_resume(struct device *dev)
acpi_battery_update(battery); acpi_battery_update(battery);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume); static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

4
drivers/acpi/button.c
View File

@ -78,7 +78,9 @@ static int acpi_button_add(struct acpi_device *device);
static int acpi_button_remove(struct acpi_device *device, int type); static int acpi_button_remove(struct acpi_device *device, int type);
static void acpi_button_notify(struct acpi_device *device, u32 event); static void acpi_button_notify(struct acpi_device *device, u32 event);
#ifdef CONFIG_PM_SLEEP
static int acpi_button_resume(struct device *dev); static int acpi_button_resume(struct device *dev);
#endif
static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume); static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);
static struct acpi_driver acpi_button_driver = { static struct acpi_driver acpi_button_driver = {
@ -310,6 +312,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
} }
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_button_resume(struct device *dev) static int acpi_button_resume(struct device *dev)
{ {
struct acpi_device *device = to_acpi_device(dev); struct acpi_device *device = to_acpi_device(dev);
@ -319,6 +322,7 @@ static int acpi_button_resume(struct device *dev)
return acpi_lid_send_state(device); return acpi_lid_send_state(device);
return 0; return 0;
} }
#endif
static int acpi_button_add(struct acpi_device *device) static int acpi_button_add(struct acpi_device *device)
{ {

4
drivers/acpi/fan.c
View File

@ -53,8 +53,10 @@ static const struct acpi_device_id fan_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, fan_device_ids); MODULE_DEVICE_TABLE(acpi, fan_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_fan_suspend(struct device *dev); static int acpi_fan_suspend(struct device *dev);
static int acpi_fan_resume(struct device *dev); static int acpi_fan_resume(struct device *dev);
#endif
static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume); static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);
static struct acpi_driver acpi_fan_driver = { static struct acpi_driver acpi_fan_driver = {
@ -184,6 +186,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_fan_suspend(struct device *dev) static int acpi_fan_suspend(struct device *dev)
{ {
if (!dev) if (!dev)
@ -207,6 +210,7 @@ static int acpi_fan_resume(struct device *dev)
return result; return result;
} }
#endif
static int __init acpi_fan_init(void) static int __init acpi_fan_init(void)
{ {

4
drivers/acpi/power.c
View File

@ -67,7 +67,9 @@ static const struct acpi_device_id power_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, power_device_ids); MODULE_DEVICE_TABLE(acpi, power_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_power_resume(struct device *dev); static int acpi_power_resume(struct device *dev);
#endif
static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume); static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);
static struct acpi_driver acpi_power_driver = { static struct acpi_driver acpi_power_driver = {
@ -775,6 +777,7 @@ static int acpi_power_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_power_resume(struct device *dev) static int acpi_power_resume(struct device *dev)
{ {
int result = 0, state; int result = 0, state;
@ -803,6 +806,7 @@ static int acpi_power_resume(struct device *dev)
return result; return result;
} }
#endif
int __init acpi_power_init(void) int __init acpi_power_init(void)
{ {

2
drivers/acpi/sbs.c
View File

@ -988,6 +988,7 @@ static void acpi_sbs_rmdirs(void)
#endif #endif
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_sbs_resume(struct device *dev) static int acpi_sbs_resume(struct device *dev)
{ {
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
@ -997,6 +998,7 @@ static int acpi_sbs_resume(struct device *dev)
acpi_sbs_callback(sbs); acpi_sbs_callback(sbs);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume); static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);

4
drivers/acpi/thermal.c
View File

@ -106,7 +106,9 @@ static const struct acpi_device_id thermal_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, thermal_device_ids); MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_thermal_resume(struct device *dev); static int acpi_thermal_resume(struct device *dev);
#endif
static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume); static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);
static struct acpi_driver acpi_thermal_driver = { static struct acpi_driver acpi_thermal_driver = {
@ -1041,6 +1043,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_thermal_resume(struct device *dev) static int acpi_thermal_resume(struct device *dev)
{ {
struct acpi_thermal *tz; struct acpi_thermal *tz;
@ -1075,6 +1078,7 @@ static int acpi_thermal_resume(struct device *dev)
return AE_OK; return AE_OK;
} }
#endif
static int thermal_act(const struct dmi_system_id *d) { static int thermal_act(const struct dmi_system_id *d) {