@@ -597,18 +597,12 @@ static struct hwmon_chip_info asus_ec_chip_info = {
.ops = &asus_ec_hwmon_ops,
};
-static unsigned long __init
-get_board_sensors(const struct device *dev)
+static unsigned long __init get_board_sensors(void)
{
- const struct dmi_system_id *dmi_entry;
+ const struct dmi_system_id *dmi_entry =
+ dmi_first_match(asus_ec_dmi_table);
- dmi_entry = dmi_first_match(asus_ec_dmi_table);
- if (!dmi_entry) {
- dev_info(dev, "Unsupported board");
- return 0;
- }
-
- return (unsigned long)dmi_entry->driver_data;
+ return dmi_entry ? (unsigned long)dmi_entry->driver_data : 0;
}
static int __init asus_ec_probe(struct platform_device *pdev)
@@ -625,7 +619,7 @@ static int __init asus_ec_probe(struct platform_device *pdev)
struct device *hwdev;
unsigned int i;
- board_sensors = get_board_sensors(dev);
+ board_sensors = get_board_sensors();
if (!board_sensors)
return -ENODEV;
Remove the call to dev_info() from the board detection function, which is called from probe(), not only to be in line with hwmon driver rules, but also because the message duplicates the error code returned from probe() for that case (ENODEV). Changes in: - v2: add missing newline (style). Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com> --- drivers/hwmon/asus-ec-sensors.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)