Commit 698fd6a2 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (lis3lv02d_i2c) Fix compile warnings
  hwmon: (i5k_amb) Fix compile warning
parents 8a3fbc9f 32292f49
...@@ -497,12 +497,14 @@ static unsigned long chipset_ids[] = { ...@@ -497,12 +497,14 @@ static unsigned long chipset_ids[] = {
0 0
}; };
#ifdef MODULE
static struct pci_device_id i5k_amb_ids[] __devinitdata = { static struct pci_device_id i5k_amb_ids[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
{ 0, } { 0, }
}; };
MODULE_DEVICE_TABLE(pci, i5k_amb_ids); MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
#endif
static int __devinit i5k_amb_probe(struct platform_device *pdev) static int __devinit i5k_amb_probe(struct platform_device *pdev)
{ {
......
...@@ -186,7 +186,7 @@ static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client) ...@@ -186,7 +186,7 @@ static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int lis3lv02d_i2c_suspend(struct device *dev) static int lis3lv02d_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = container_of(dev, struct i2c_client, dev);
...@@ -213,12 +213,9 @@ static int lis3lv02d_i2c_resume(struct device *dev) ...@@ -213,12 +213,9 @@ static int lis3lv02d_i2c_resume(struct device *dev)
return 0; return 0;
} }
#else #endif /* CONFIG_PM_SLEEP */
#define lis3lv02d_i2c_suspend NULL
#define lis3lv02d_i2c_resume NULL
#define lis3lv02d_i2c_shutdown NULL
#endif
#ifdef CONFIG_PM_RUNTIME
static int lis3_i2c_runtime_suspend(struct device *dev) static int lis3_i2c_runtime_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = container_of(dev, struct i2c_client, dev);
...@@ -236,6 +233,7 @@ static int lis3_i2c_runtime_resume(struct device *dev) ...@@ -236,6 +233,7 @@ static int lis3_i2c_runtime_resume(struct device *dev)
lis3lv02d_poweron(lis3); lis3lv02d_poweron(lis3);
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */
static const struct i2c_device_id lis3lv02d_id[] = { static const struct i2c_device_id lis3lv02d_id[] = {
{"lis3lv02d", 0 }, {"lis3lv02d", 0 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment