From 857a4fb49cf344de806bd3163dcc81d53678848a Mon Sep 17 00:00:00 2001 From: brandon_chuang Date: Wed, 23 Jan 2019 11:29:10 +0800 Subject: [PATCH 1/3] [as4610] Fix error while loading fan driver on fanless devices --- .../accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c index ab69fb19..fe78e044 100644 --- a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c +++ b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c @@ -327,7 +327,7 @@ static int __init as4610_fan_init(void) int ret; if (as4610_number_of_system_fan() == 0) { - return -ENODEV; + return 0; } ret = platform_driver_register(&as4610_fan_driver); From 3f8142ccf42ba6ecefd075aefc419d94a2ceebfc Mon Sep 17 00:00:00 2001 From: brandon_chuang Date: Tue, 12 Feb 2019 14:37:29 +0800 Subject: [PATCH 2/3] [as4610] Replace hwmon_device_register() with hwmon_device_register_with_info() --- packages/base/any/kernels/modules/ym2651y.c | 3 ++- .../accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c | 3 ++- .../accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/base/any/kernels/modules/ym2651y.c b/packages/base/any/kernels/modules/ym2651y.c index 8e8cc540..18742cb7 100644 --- a/packages/base/any/kernels/modules/ym2651y.c +++ b/packages/base/any/kernels/modules/ym2651y.c @@ -461,7 +461,8 @@ static int ym2651y_probe(struct i2c_client *client, goto exit_free; } - data->hwmon_dev = hwmon_device_register(&client->dev); + data->hwmon_dev = hwmon_device_register_with_info(&client->dev, "ym2651y", + NULL, NULL, NULL); if (IS_ERR(data->hwmon_dev)) { status = PTR_ERR(data->hwmon_dev); goto exit_remove; diff --git a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c index fe78e044..9b134e56 100644 --- a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c +++ b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c @@ -262,7 +262,8 @@ static int as4610_fan_probe(struct platform_device *pdev) } - fan_data->hwmon_dev = hwmon_device_register(&pdev->dev); + fan_data->hwmon_dev = hwmon_device_register_with_info(&pdev->dev, "as4610_fan", + NULL, NULL, NULL); if (IS_ERR(fan_data->hwmon_dev)) { status = PTR_ERR(fan_data->hwmon_dev); goto exit_remove; diff --git a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c index 68f0348d..0505c37f 100644 --- a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c +++ b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c @@ -135,7 +135,8 @@ static int as4610_psu_probe(struct i2c_client *client, goto exit_free; } - data->hwmon_dev = hwmon_device_register(&client->dev); + data->hwmon_dev = hwmon_device_register_with_info(&client->dev, "as4610_psu", + NULL, NULL, NULL); if (IS_ERR(data->hwmon_dev)) { status = PTR_ERR(data->hwmon_dev); goto exit_remove; From 2fb688afc238d461ed7cd39dcb314a8223a89dc4 Mon Sep 17 00:00:00 2001 From: brandon_chuang Date: Fri, 22 Feb 2019 10:22:25 +0800 Subject: [PATCH 3/3] Revert "[as4610] Replace hwmon_device_register() with hwmon_device_register_with_info()" This reverts commit 3f8142ccf42ba6ecefd075aefc419d94a2ceebfc. --- packages/base/any/kernels/modules/ym2651y.c | 3 +-- .../accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c | 3 +-- .../accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/base/any/kernels/modules/ym2651y.c b/packages/base/any/kernels/modules/ym2651y.c index 18742cb7..8e8cc540 100644 --- a/packages/base/any/kernels/modules/ym2651y.c +++ b/packages/base/any/kernels/modules/ym2651y.c @@ -461,8 +461,7 @@ static int ym2651y_probe(struct i2c_client *client, goto exit_free; } - data->hwmon_dev = hwmon_device_register_with_info(&client->dev, "ym2651y", - NULL, NULL, NULL); + data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { status = PTR_ERR(data->hwmon_dev); goto exit_remove; diff --git a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c index 9b134e56..fe78e044 100644 --- a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c +++ b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_fan.c @@ -262,8 +262,7 @@ static int as4610_fan_probe(struct platform_device *pdev) } - fan_data->hwmon_dev = hwmon_device_register_with_info(&pdev->dev, "as4610_fan", - NULL, NULL, NULL); + fan_data->hwmon_dev = hwmon_device_register(&pdev->dev); if (IS_ERR(fan_data->hwmon_dev)) { status = PTR_ERR(fan_data->hwmon_dev); goto exit_remove; diff --git a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c index 0505c37f..68f0348d 100644 --- a/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c +++ b/packages/platforms/accton/armxx/arm-accton-as4610/modules/accton_as4610_psu.c @@ -135,8 +135,7 @@ static int as4610_psu_probe(struct i2c_client *client, goto exit_free; } - data->hwmon_dev = hwmon_device_register_with_info(&client->dev, "as4610_psu", - NULL, NULL, NULL); + data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { status = PTR_ERR(data->hwmon_dev); goto exit_remove;