openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (nct6775) Convert to use SIMPLE_DEV_PM_OPS 

Get rid of #ifdef CONFIG_PM by using SIMPLE_DEV_PM_OPS and declaring suspend
and resume functions with __maybe_unused.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2015-02-07 08:48:49 -08:00
parent f6906edeac
commit 48e9318256
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/hwmon/nct6775.c
View File

@ -880,12 +880,11 @@ struct nct6775_data {
u16 have_temp; u16 have_temp;
u16 have_temp_fixed; u16 have_temp_fixed;
u16 have_in; u16 have_in;
#ifdef CONFIG_PM
/* Remember extra register values over suspend/resume */ /* Remember extra register values over suspend/resume */
u8 vbat; u8 vbat;
u8 fandiv1; u8 fandiv1;
u8 fandiv2; u8 fandiv2;
#endif
}; };
struct nct6775_sio_data { struct nct6775_sio_data {
@ -3989,8 +3988,7 @@ static void nct6791_enable_io_mapping(int sioaddr)
} }
} }
#ifdef CONFIG_PM static int __maybe_unused nct6775_suspend(struct device *dev)
static int nct6775_suspend(struct device *dev)
{ {
struct nct6775_data *data = nct6775_update_device(dev); struct nct6775_data *data = nct6775_update_device(dev);
@ -4005,7 +4003,7 @@ static int nct6775_suspend(struct device *dev)
return 0; return 0;
} }
static int nct6775_resume(struct device *dev) static int __maybe_unused nct6775_resume(struct device *dev)
{ {
struct nct6775_data *data = dev_get_drvdata(dev); struct nct6775_data *data = dev_get_drvdata(dev);
int i, j, err = 0; int i, j, err = 0;
@ -4066,22 +4064,12 @@ static int nct6775_resume(struct device *dev)
return err; return err;
} }
static const struct dev_pm_ops nct6775_dev_pm_ops = { static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
.suspend = nct6775_suspend,
.resume = nct6775_resume,
.freeze = nct6775_suspend,
.restore = nct6775_resume,
};
#define NCT6775_DEV_PM_OPS (&nct6775_dev_pm_ops)
#else
#define NCT6775_DEV_PM_OPS NULL
#endif /* CONFIG_PM */
static struct platform_driver nct6775_driver = { static struct platform_driver nct6775_driver = {
.driver = { .driver = {
.name = DRVNAME, .name = DRVNAME,
.pm = NCT6775_DEV_PM_OPS, .pm = &nct6775_dev_pm_ops,
}, },
.probe = nct6775_probe, .probe = nct6775_probe,
}; };