[PATCH v3] hwmon: (asus-ec-sensors) merge setup functions

Eugene Shalygin
2022-02-16T16:01:41Z

Changes:
- v2: add local struct device *dev = &pdev->dev;
- v3: initialize dev at declaration

Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
---
drivers/hwmon/asus-ec-sensors.c | 38 ++++++++++++++-------------------
1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
index bfac08a5dc57..b9eb9126e433 100644
--- a/drivers/hwmon/asus-ec-sensors.c
+++ b/drivers/hwmon/asus-ec-sensors.c
@@ -589,23 +589,33 @@ get_board_sensors(const struct device *dev)
return (unsigned long)dmi_entry->driver_data;
}

-static int __init configure_sensor_setup(struct device *dev)
+static int __init asus_ec_probe(struct platform_device *pdev)
{
- struct ec_sensors_data *ec_data = dev_get_drvdata(dev);
+ const struct hwmon_channel_info **ptr_asus_ec_ci;
int nr_count[hwmon_max] = { 0 }, nr_types = 0;
- struct device *hwdev;
struct hwmon_channel_info *asus_ec_hwmon_chan;
- const struct hwmon_channel_info **ptr_asus_ec_ci;
const struct hwmon_chip_info *chip_info;
const struct ec_sensor_info *si;
+ struct ec_sensors_data *ec_data;
enum hwmon_sensor_types type;
+ unsigned long board_sensors;
+ struct device *hwdev;
unsigned int i;

- ec_data->board_sensors = get_board_sensors(dev);
- if (!ec_data->board_sensors) {
+ struct device *dev = &pdev->dev;
+ board_sensors = get_board_sensors(dev);
+ if (!board_sensors) {
return -ENODEV;
}

+ ec_data = devm_kzalloc(dev, sizeof(struct ec_sensors_data),
+ GFP_KERNEL);
+ if (!ec_data) {
+ return -ENOMEM;
+ }
+
+ dev_set_drvdata(dev, ec_data);
+ ec_data->board_sensors = board_sensors;
ec_data->nr_sensors = board_sensors_count(ec_data->board_sensors);
ec_data->sensors = devm_kcalloc(dev, ec_data->nr_sensors,
sizeof(struct ec_sensor), GFP_KERNEL);
@@ -666,22 +676,6 @@ static int __init configure_sensor_setup(struct device *dev)