Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+2
drivers/hwmon/i5k_amb.c
+2
drivers/hwmon/i5k_amb.c
···
497
0
498
};
499
500
static struct pci_device_id i5k_amb_ids[] __devinitdata = {
501
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
502
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
503
{ 0, }
504
};
505
MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
506
507
static int __devinit i5k_amb_probe(struct platform_device *pdev)
508
{
···
497
0
498
};
499
500
+
#ifdef MODULE
501
static struct pci_device_id i5k_amb_ids[] __devinitdata = {
502
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
503
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
504
{ 0, }
505
};
506
MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
507
+
#endif
508
509
static int __devinit i5k_amb_probe(struct platform_device *pdev)
510
{
+4
-6
drivers/hwmon/lis3lv02d_i2c.c
+4
-6
drivers/hwmon/lis3lv02d_i2c.c
···
186
return 0;
187
}
188
189
-
#ifdef CONFIG_PM
190
static int lis3lv02d_i2c_suspend(struct device *dev)
191
{
192
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
···
213
214
return 0;
215
}
216
-
#else
217
-
#define lis3lv02d_i2c_suspend NULL
218
-
#define lis3lv02d_i2c_resume NULL
219
-
#define lis3lv02d_i2c_shutdown NULL
220
-
#endif
221
222
static int lis3_i2c_runtime_suspend(struct device *dev)
223
{
224
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
···
233
lis3lv02d_poweron(lis3);
234
return 0;
235
}
236
237
static const struct i2c_device_id lis3lv02d_id[] = {
238
{"lis3lv02d", 0 },
···
186
return 0;
187
}
188
189
+
#ifdef CONFIG_PM_SLEEP
190
static int lis3lv02d_i2c_suspend(struct device *dev)
191
{
192
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
···
213
214
return 0;
215
}
216
+
#endif /* CONFIG_PM_SLEEP */
217
218
+
#ifdef CONFIG_PM_RUNTIME
219
static int lis3_i2c_runtime_suspend(struct device *dev)
220
{
221
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
···
236
lis3lv02d_poweron(lis3);
237
return 0;
238
}
239
+
#endif /* CONFIG_PM_RUNTIME */
240
241
static const struct i2c_device_id lis3lv02d_id[] = {
242
{"lis3lv02d", 0 },