提交 97a652a8 编写于 作者: J Jingoo Han 提交者: Dmitry Torokhov

Input: misc - use __maybe_unused instead of ifdef around suspend/resume

Use __maybe_unused instead of ifdef guards around suspend/resume
functions, in order to increase build coverage and fix build warnings.
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
上级 6bdd2fd1
...@@ -112,8 +112,7 @@ static int pm860x_onkey_probe(struct platform_device *pdev) ...@@ -112,8 +112,7 @@ static int pm860x_onkey_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused pm860x_onkey_suspend(struct device *dev)
static int pm860x_onkey_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
...@@ -122,7 +121,7 @@ static int pm860x_onkey_suspend(struct device *dev) ...@@ -122,7 +121,7 @@ static int pm860x_onkey_suspend(struct device *dev)
chip->wakeup_flag |= 1 << PM8607_IRQ_ONKEY; chip->wakeup_flag |= 1 << PM8607_IRQ_ONKEY;
return 0; return 0;
} }
static int pm860x_onkey_resume(struct device *dev) static int __maybe_unused pm860x_onkey_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
...@@ -131,7 +130,6 @@ static int pm860x_onkey_resume(struct device *dev) ...@@ -131,7 +130,6 @@ static int pm860x_onkey_resume(struct device *dev)
chip->wakeup_flag &= ~(1 << PM8607_IRQ_ONKEY); chip->wakeup_flag &= ~(1 << PM8607_IRQ_ONKEY);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(pm860x_onkey_pm_ops, pm860x_onkey_suspend, pm860x_onkey_resume); static SIMPLE_DEV_PM_OPS(pm860x_onkey_pm_ops, pm860x_onkey_suspend, pm860x_onkey_resume);
......
...@@ -13,17 +13,15 @@ ...@@ -13,17 +13,15 @@
#include <linux/pm.h> #include <linux/pm.h>
#include "ad714x.h" #include "ad714x.h"
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ad714x_i2c_suspend(struct device *dev)
static int ad714x_i2c_suspend(struct device *dev)
{ {
return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev))); return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev)));
} }
static int ad714x_i2c_resume(struct device *dev) static int __maybe_unused ad714x_i2c_resume(struct device *dev)
{ {
return ad714x_enable(i2c_get_clientdata(to_i2c_client(dev))); return ad714x_enable(i2c_get_clientdata(to_i2c_client(dev)));
} }
#endif
static SIMPLE_DEV_PM_OPS(ad714x_i2c_pm, ad714x_i2c_suspend, ad714x_i2c_resume); static SIMPLE_DEV_PM_OPS(ad714x_i2c_pm, ad714x_i2c_suspend, ad714x_i2c_resume);
......
...@@ -16,17 +16,15 @@ ...@@ -16,17 +16,15 @@
#define AD714x_SPI_CMD_PREFIX 0xE000 /* bits 15:11 */ #define AD714x_SPI_CMD_PREFIX 0xE000 /* bits 15:11 */
#define AD714x_SPI_READ BIT(10) #define AD714x_SPI_READ BIT(10)
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ad714x_spi_suspend(struct device *dev)
static int ad714x_spi_suspend(struct device *dev)
{ {
return ad714x_disable(spi_get_drvdata(to_spi_device(dev))); return ad714x_disable(spi_get_drvdata(to_spi_device(dev)));
} }
static int ad714x_spi_resume(struct device *dev) static int __maybe_unused ad714x_spi_resume(struct device *dev)
{ {
return ad714x_enable(spi_get_drvdata(to_spi_device(dev))); return ad714x_enable(spi_get_drvdata(to_spi_device(dev)));
} }
#endif
static SIMPLE_DEV_PM_OPS(ad714x_spi_pm, ad714x_spi_suspend, ad714x_spi_resume); static SIMPLE_DEV_PM_OPS(ad714x_spi_pm, ad714x_spi_suspend, ad714x_spi_resume);
......
...@@ -105,8 +105,7 @@ static int adxl34x_i2c_remove(struct i2c_client *client) ...@@ -105,8 +105,7 @@ static int adxl34x_i2c_remove(struct i2c_client *client)
return adxl34x_remove(ac); return adxl34x_remove(ac);
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused adxl34x_i2c_suspend(struct device *dev)
static int adxl34x_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adxl34x *ac = i2c_get_clientdata(client); struct adxl34x *ac = i2c_get_clientdata(client);
...@@ -116,7 +115,7 @@ static int adxl34x_i2c_suspend(struct device *dev) ...@@ -116,7 +115,7 @@ static int adxl34x_i2c_suspend(struct device *dev)
return 0; return 0;
} }
static int adxl34x_i2c_resume(struct device *dev) static int __maybe_unused adxl34x_i2c_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adxl34x *ac = i2c_get_clientdata(client); struct adxl34x *ac = i2c_get_clientdata(client);
...@@ -125,7 +124,6 @@ static int adxl34x_i2c_resume(struct device *dev) ...@@ -125,7 +124,6 @@ static int adxl34x_i2c_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(adxl34x_i2c_pm, adxl34x_i2c_suspend, static SIMPLE_DEV_PM_OPS(adxl34x_i2c_pm, adxl34x_i2c_suspend,
adxl34x_i2c_resume); adxl34x_i2c_resume);
......
...@@ -94,8 +94,7 @@ static int adxl34x_spi_remove(struct spi_device *spi) ...@@ -94,8 +94,7 @@ static int adxl34x_spi_remove(struct spi_device *spi)
return adxl34x_remove(ac); return adxl34x_remove(ac);
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused adxl34x_spi_suspend(struct device *dev)
static int adxl34x_spi_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct adxl34x *ac = spi_get_drvdata(spi); struct adxl34x *ac = spi_get_drvdata(spi);
...@@ -105,7 +104,7 @@ static int adxl34x_spi_suspend(struct device *dev) ...@@ -105,7 +104,7 @@ static int adxl34x_spi_suspend(struct device *dev)
return 0; return 0;
} }
static int adxl34x_spi_resume(struct device *dev) static int __maybe_unused adxl34x_spi_resume(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct adxl34x *ac = spi_get_drvdata(spi); struct adxl34x *ac = spi_get_drvdata(spi);
...@@ -114,7 +113,6 @@ static int adxl34x_spi_resume(struct device *dev) ...@@ -114,7 +113,6 @@ static int adxl34x_spi_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend, static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend,
adxl34x_spi_resume); adxl34x_spi_resume);
......
...@@ -639,8 +639,7 @@ static int drv260x_probe(struct i2c_client *client, ...@@ -639,8 +639,7 @@ static int drv260x_probe(struct i2c_client *client,
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused drv260x_suspend(struct device *dev)
static int drv260x_suspend(struct device *dev)
{ {
struct drv260x_data *haptics = dev_get_drvdata(dev); struct drv260x_data *haptics = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
...@@ -672,7 +671,7 @@ static int drv260x_suspend(struct device *dev) ...@@ -672,7 +671,7 @@ static int drv260x_suspend(struct device *dev)
return ret; return ret;
} }
static int drv260x_resume(struct device *dev) static int __maybe_unused drv260x_resume(struct device *dev)
{ {
struct drv260x_data *haptics = dev_get_drvdata(dev); struct drv260x_data *haptics = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
...@@ -702,7 +701,6 @@ static int drv260x_resume(struct device *dev) ...@@ -702,7 +701,6 @@ static int drv260x_resume(struct device *dev)
mutex_unlock(&haptics->input_dev->mutex); mutex_unlock(&haptics->input_dev->mutex);
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(drv260x_pm_ops, drv260x_suspend, drv260x_resume); static SIMPLE_DEV_PM_OPS(drv260x_pm_ops, drv260x_suspend, drv260x_resume);
......
...@@ -406,8 +406,7 @@ static int drv2667_probe(struct i2c_client *client, ...@@ -406,8 +406,7 @@ static int drv2667_probe(struct i2c_client *client,
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused drv2667_suspend(struct device *dev)
static int drv2667_suspend(struct device *dev)
{ {
struct drv2667_data *haptics = dev_get_drvdata(dev); struct drv2667_data *haptics = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
...@@ -436,7 +435,7 @@ static int drv2667_suspend(struct device *dev) ...@@ -436,7 +435,7 @@ static int drv2667_suspend(struct device *dev)
return ret; return ret;
} }
static int drv2667_resume(struct device *dev) static int __maybe_unused drv2667_resume(struct device *dev)
{ {
struct drv2667_data *haptics = dev_get_drvdata(dev); struct drv2667_data *haptics = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
...@@ -464,7 +463,6 @@ static int drv2667_resume(struct device *dev) ...@@ -464,7 +463,6 @@ static int drv2667_resume(struct device *dev)
mutex_unlock(&haptics->input_dev->mutex); mutex_unlock(&haptics->input_dev->mutex);
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(drv2667_pm_ops, drv2667_suspend, drv2667_resume); static SIMPLE_DEV_PM_OPS(drv2667_pm_ops, drv2667_suspend, drv2667_resume);
......
...@@ -225,8 +225,7 @@ static int gp2a_remove(struct i2c_client *client) ...@@ -225,8 +225,7 @@ static int gp2a_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused gp2a_suspend(struct device *dev)
static int gp2a_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct gp2a_data *dt = i2c_get_clientdata(client); struct gp2a_data *dt = i2c_get_clientdata(client);
...@@ -244,7 +243,7 @@ static int gp2a_suspend(struct device *dev) ...@@ -244,7 +243,7 @@ static int gp2a_suspend(struct device *dev)
return retval; return retval;
} }
static int gp2a_resume(struct device *dev) static int __maybe_unused gp2a_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct gp2a_data *dt = i2c_get_clientdata(client); struct gp2a_data *dt = i2c_get_clientdata(client);
...@@ -261,7 +260,6 @@ static int gp2a_resume(struct device *dev) ...@@ -261,7 +260,6 @@ static int gp2a_resume(struct device *dev)
return retval; return retval;
} }
#endif
static SIMPLE_DEV_PM_OPS(gp2a_pm, gp2a_suspend, gp2a_resume); static SIMPLE_DEV_PM_OPS(gp2a_pm, gp2a_suspend, gp2a_resume);
......
...@@ -615,8 +615,7 @@ static int kxtj9_remove(struct i2c_client *client) ...@@ -615,8 +615,7 @@ static int kxtj9_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused kxtj9_suspend(struct device *dev)
static int kxtj9_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct kxtj9_data *tj9 = i2c_get_clientdata(client); struct kxtj9_data *tj9 = i2c_get_clientdata(client);
...@@ -631,7 +630,7 @@ static int kxtj9_suspend(struct device *dev) ...@@ -631,7 +630,7 @@ static int kxtj9_suspend(struct device *dev)
return 0; return 0;
} }
static int kxtj9_resume(struct device *dev) static int __maybe_unused kxtj9_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct kxtj9_data *tj9 = i2c_get_clientdata(client); struct kxtj9_data *tj9 = i2c_get_clientdata(client);
...@@ -646,7 +645,6 @@ static int kxtj9_resume(struct device *dev) ...@@ -646,7 +645,6 @@ static int kxtj9_resume(struct device *dev)
mutex_unlock(&input_dev->mutex); mutex_unlock(&input_dev->mutex);
return retval; return retval;
} }
#endif
static SIMPLE_DEV_PM_OPS(kxtj9_pm_ops, kxtj9_suspend, kxtj9_resume); static SIMPLE_DEV_PM_OPS(kxtj9_pm_ops, kxtj9_suspend, kxtj9_resume);
......
...@@ -310,8 +310,7 @@ static int max77693_haptic_probe(struct platform_device *pdev) ...@@ -310,8 +310,7 @@ static int max77693_haptic_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused max77693_haptic_suspend(struct device *dev)
static int max77693_haptic_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max77693_haptic *haptic = platform_get_drvdata(pdev); struct max77693_haptic *haptic = platform_get_drvdata(pdev);
...@@ -324,7 +323,7 @@ static int max77693_haptic_suspend(struct device *dev) ...@@ -324,7 +323,7 @@ static int max77693_haptic_suspend(struct device *dev)
return 0; return 0;
} }
static int max77693_haptic_resume(struct device *dev) static int __maybe_unused max77693_haptic_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max77693_haptic *haptic = platform_get_drvdata(pdev); struct max77693_haptic *haptic = platform_get_drvdata(pdev);
...@@ -336,7 +335,6 @@ static int max77693_haptic_resume(struct device *dev) ...@@ -336,7 +335,6 @@ static int max77693_haptic_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(max77693_haptic_pm_ops, static SIMPLE_DEV_PM_OPS(max77693_haptic_pm_ops,
max77693_haptic_suspend, max77693_haptic_resume); max77693_haptic_suspend, max77693_haptic_resume);
......
...@@ -133,8 +133,7 @@ static int max8925_onkey_probe(struct platform_device *pdev) ...@@ -133,8 +133,7 @@ static int max8925_onkey_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused max8925_onkey_suspend(struct device *dev)
static int max8925_onkey_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max8925_onkey_info *info = platform_get_drvdata(pdev); struct max8925_onkey_info *info = platform_get_drvdata(pdev);
...@@ -148,7 +147,7 @@ static int max8925_onkey_suspend(struct device *dev) ...@@ -148,7 +147,7 @@ static int max8925_onkey_suspend(struct device *dev)
return 0; return 0;
} }
static int max8925_onkey_resume(struct device *dev) static int __maybe_unused max8925_onkey_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max8925_onkey_info *info = platform_get_drvdata(pdev); struct max8925_onkey_info *info = platform_get_drvdata(pdev);
...@@ -161,7 +160,6 @@ static int max8925_onkey_resume(struct device *dev) ...@@ -161,7 +160,6 @@ static int max8925_onkey_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(max8925_onkey_pm_ops, max8925_onkey_suspend, max8925_onkey_resume); static SIMPLE_DEV_PM_OPS(max8925_onkey_pm_ops, max8925_onkey_suspend, max8925_onkey_resume);
......
...@@ -378,8 +378,7 @@ static int max8997_haptic_remove(struct platform_device *pdev) ...@@ -378,8 +378,7 @@ static int max8997_haptic_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused max8997_haptic_suspend(struct device *dev)
static int max8997_haptic_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max8997_haptic *chip = platform_get_drvdata(pdev); struct max8997_haptic *chip = platform_get_drvdata(pdev);
...@@ -388,7 +387,6 @@ static int max8997_haptic_suspend(struct device *dev) ...@@ -388,7 +387,6 @@ static int max8997_haptic_suspend(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL); static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL);
......
...@@ -260,7 +260,6 @@ static int palmas_pwron_remove(struct platform_device *pdev) ...@@ -260,7 +260,6 @@ static int palmas_pwron_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
/** /**
* palmas_pwron_suspend() - suspend handler * palmas_pwron_suspend() - suspend handler
* @dev: power button device * @dev: power button device
...@@ -269,7 +268,7 @@ static int palmas_pwron_remove(struct platform_device *pdev) ...@@ -269,7 +268,7 @@ static int palmas_pwron_remove(struct platform_device *pdev)
* *
* Return: 0 * Return: 0
*/ */
static int palmas_pwron_suspend(struct device *dev) static int __maybe_unused palmas_pwron_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct palmas_pwron *pwron = platform_get_drvdata(pdev); struct palmas_pwron *pwron = platform_get_drvdata(pdev);
...@@ -290,7 +289,7 @@ static int palmas_pwron_suspend(struct device *dev) ...@@ -290,7 +289,7 @@ static int palmas_pwron_suspend(struct device *dev)
* *
* Return: 0 * Return: 0
*/ */
static int palmas_pwron_resume(struct device *dev) static int __maybe_unused palmas_pwron_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct palmas_pwron *pwron = platform_get_drvdata(pdev); struct palmas_pwron *pwron = platform_get_drvdata(pdev);
...@@ -300,7 +299,6 @@ static int palmas_pwron_resume(struct device *dev) ...@@ -300,7 +299,6 @@ static int palmas_pwron_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(palmas_pwron_pm, static SIMPLE_DEV_PM_OPS(palmas_pwron_pm,
palmas_pwron_suspend, palmas_pwron_resume); palmas_pwron_suspend, palmas_pwron_resume);
......
...@@ -199,8 +199,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) ...@@ -199,8 +199,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused pm8xxx_vib_suspend(struct device *dev)
static int pm8xxx_vib_suspend(struct device *dev)
{ {
struct pm8xxx_vib *vib = dev_get_drvdata(dev); struct pm8xxx_vib *vib = dev_get_drvdata(dev);
...@@ -209,7 +208,6 @@ static int pm8xxx_vib_suspend(struct device *dev) ...@@ -209,7 +208,6 @@ static int pm8xxx_vib_suspend(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL); static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL);
......
...@@ -53,8 +53,7 @@ static irqreturn_t pwrkey_release_irq(int irq, void *_pwr) ...@@ -53,8 +53,7 @@ static irqreturn_t pwrkey_release_irq(int irq, void *_pwr)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused pmic8xxx_pwrkey_suspend(struct device *dev)
static int pmic8xxx_pwrkey_suspend(struct device *dev)
{ {
struct pmic8xxx_pwrkey *pwrkey = dev_get_drvdata(dev); struct pmic8xxx_pwrkey *pwrkey = dev_get_drvdata(dev);
...@@ -64,7 +63,7 @@ static int pmic8xxx_pwrkey_suspend(struct device *dev) ...@@ -64,7 +63,7 @@ static int pmic8xxx_pwrkey_suspend(struct device *dev)
return 0; return 0;
} }
static int pmic8xxx_pwrkey_resume(struct device *dev) static int __maybe_unused pmic8xxx_pwrkey_resume(struct device *dev)
{ {
struct pmic8xxx_pwrkey *pwrkey = dev_get_drvdata(dev); struct pmic8xxx_pwrkey *pwrkey = dev_get_drvdata(dev);
...@@ -73,7 +72,6 @@ static int pmic8xxx_pwrkey_resume(struct device *dev) ...@@ -73,7 +72,6 @@ static int pmic8xxx_pwrkey_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(pm8xxx_pwr_key_pm_ops, static SIMPLE_DEV_PM_OPS(pm8xxx_pwr_key_pm_ops,
pmic8xxx_pwrkey_suspend, pmic8xxx_pwrkey_resume); pmic8xxx_pwrkey_suspend, pmic8xxx_pwrkey_resume);
......
...@@ -144,8 +144,7 @@ static int pwm_beeper_remove(struct platform_device *pdev) ...@@ -144,8 +144,7 @@ static int pwm_beeper_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused pwm_beeper_suspend(struct device *dev)
static int pwm_beeper_suspend(struct device *dev)
{ {
struct pwm_beeper *beeper = dev_get_drvdata(dev); struct pwm_beeper *beeper = dev_get_drvdata(dev);
...@@ -155,7 +154,7 @@ static int pwm_beeper_suspend(struct device *dev) ...@@ -155,7 +154,7 @@ static int pwm_beeper_suspend(struct device *dev)
return 0; return 0;
} }
static int pwm_beeper_resume(struct device *dev) static int __maybe_unused pwm_beeper_resume(struct device *dev)
{ {
struct pwm_beeper *beeper = dev_get_drvdata(dev); struct pwm_beeper *beeper = dev_get_drvdata(dev);
...@@ -170,6 +169,7 @@ static int pwm_beeper_resume(struct device *dev) ...@@ -170,6 +169,7 @@ static int pwm_beeper_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops, static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
pwm_beeper_suspend, pwm_beeper_resume); pwm_beeper_suspend, pwm_beeper_resume);
#ifdef CONFIG_PM_SLEEP
#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops) #define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
#else #else
#define PWM_BEEPER_PM_OPS NULL #define PWM_BEEPER_PM_OPS NULL
......
...@@ -179,8 +179,7 @@ static int sirfsoc_pwrc_remove(struct platform_device *pdev) ...@@ -179,8 +179,7 @@ static int sirfsoc_pwrc_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused sirfsoc_pwrc_resume(struct device *dev)
static int sirfsoc_pwrc_resume(struct device *dev)
{ {
struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(dev); struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(dev);
struct input_dev *input = pwrcdrv->input; struct input_dev *input = pwrcdrv->input;
...@@ -196,7 +195,6 @@ static int sirfsoc_pwrc_resume(struct device *dev) ...@@ -196,7 +195,6 @@ static int sirfsoc_pwrc_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(sirfsoc_pwrc_pm_ops, NULL, sirfsoc_pwrc_resume); static SIMPLE_DEV_PM_OPS(sirfsoc_pwrc_pm_ops, NULL, sirfsoc_pwrc_resume);
......
...@@ -157,8 +157,7 @@ static void twl4030_vibra_close(struct input_dev *input) ...@@ -157,8 +157,7 @@ static void twl4030_vibra_close(struct input_dev *input)
} }
/*** Module ***/ /*** Module ***/
#ifdef CONFIG_PM_SLEEP static int __maybe_unused twl4030_vibra_suspend(struct device *dev)
static int twl4030_vibra_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct vibra_info *info = platform_get_drvdata(pdev); struct vibra_info *info = platform_get_drvdata(pdev);
...@@ -169,12 +168,11 @@ static int twl4030_vibra_suspend(struct device *dev) ...@@ -169,12 +168,11 @@ static int twl4030_vibra_suspend(struct device *dev)
return 0; return 0;
} }
static int twl4030_vibra_resume(struct device *dev) static int __maybe_unused twl4030_vibra_resume(struct device *dev)
{ {
vibra_disable_leds(); vibra_disable_leds();
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
twl4030_vibra_suspend, twl4030_vibra_resume); twl4030_vibra_suspend, twl4030_vibra_resume);
......
...@@ -236,8 +236,7 @@ static void twl6040_vibra_close(struct input_dev *input) ...@@ -236,8 +236,7 @@ static void twl6040_vibra_close(struct input_dev *input)
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused twl6040_vibra_suspend(struct device *dev)
static int twl6040_vibra_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct vibra_info *info = platform_get_drvdata(pdev); struct vibra_info *info = platform_get_drvdata(pdev);
...@@ -251,7 +250,6 @@ static int twl6040_vibra_suspend(struct device *dev) ...@@ -251,7 +250,6 @@ static int twl6040_vibra_suspend(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL); static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册