hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/hwmon/adt7411.c
....@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Driver for the ADT7411 (I2C/SPI 8 channel 10 bit ADC & temperature-sensor)
34 *
45 * Copyright (C) 2008, 2010 Pengutronix
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
96 *
107 * TODO: SPI, use power-down mode for suspend?, interrupt handling?
118 */
....@@ -639,40 +636,22 @@
639636 return i2c_smbus_write_byte_data(data->client, ADT7411_REG_CFG1, val);
640637 }
641638
642
-static const u32 adt7411_in_config[] = {
643
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
644
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
645
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
646
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
647
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
648
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
649
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
650
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
651
- HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
652
- 0
653
-};
654
-
655
-static const struct hwmon_channel_info adt7411_in = {
656
- .type = hwmon_in,
657
- .config = adt7411_in_config,
658
-};
659
-
660
-static const u32 adt7411_temp_config[] = {
661
- HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |
662
- HWMON_T_MAX | HWMON_T_MAX_ALARM,
663
- HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |
664
- HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT,
665
- 0
666
-};
667
-
668
-static const struct hwmon_channel_info adt7411_temp = {
669
- .type = hwmon_temp,
670
- .config = adt7411_temp_config,
671
-};
672
-
673639 static const struct hwmon_channel_info *adt7411_info[] = {
674
- &adt7411_in,
675
- &adt7411_temp,
640
+ HWMON_CHANNEL_INFO(in,
641
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
642
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
643
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
644
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
645
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
646
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
647
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
648
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM,
649
+ HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM),
650
+ HWMON_CHANNEL_INFO(temp,
651
+ HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |
652
+ HWMON_T_MAX | HWMON_T_MAX_ALARM,
653
+ HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM |
654
+ HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT),
676655 NULL
677656 };
678657
....@@ -687,8 +666,7 @@
687666 .info = adt7411_info,
688667 };
689668
690
-static int adt7411_probe(struct i2c_client *client,
691
- const struct i2c_device_id *id)
669
+static int adt7411_probe(struct i2c_client *client)
692670 {
693671 struct device *dev = &client->dev;
694672 struct adt7411_data *data;
....@@ -728,7 +706,7 @@
728706 .driver = {
729707 .name = "adt7411",
730708 },
731
- .probe = adt7411_probe,
709
+ .probe_new = adt7411_probe,
732710 .id_table = adt7411_id,
733711 .detect = adt7411_detect,
734712 .address_list = normal_i2c,
....@@ -737,7 +715,6 @@
737715
738716 module_i2c_driver(adt7411_driver);
739717
740
-MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de> and "
741
- "Wolfram Sang <w.sang@pengutronix.de>");
718
+MODULE_AUTHOR("Sascha Hauer, Wolfram Sang <kernel@pengutronix.de>");
742719 MODULE_DESCRIPTION("ADT7411 driver");
743720 MODULE_LICENSE("GPL v2");