* [PATCH] Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()"
@ 2017-01-23 15:13 Fabio Estevam
2017-01-23 17:10 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2017-01-23 15:13 UTC (permalink / raw)
To: rui.zhang; +Cc: pavel, linux, linux-pm, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
This reverts commit 7611fb68062f8d7f416f3272894d1edf7bbff29c.
Pavel Machek reported breakage in the Nokia N900 due to this commit.
We can revisit a proper fix for the warning later.
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/thermal/thermal_hwmon.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index c4a508a..541af59 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -59,6 +59,14 @@ static LIST_HEAD(thermal_hwmon_list);
static DEFINE_MUTEX(thermal_hwmon_list_lock);
static ssize_t
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
+ return sprintf(buf, "%s\n", hwmon->type);
+}
+static DEVICE_ATTR_RO(name);
+
+static ssize_t
temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
{
int temperature;
@@ -157,12 +165,15 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
INIT_LIST_HEAD(&hwmon->tz_list);
strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
- hwmon->device = hwmon_device_register_with_info(NULL, hwmon->type,
- hwmon, NULL, NULL);
+ hwmon->device = hwmon_device_register(NULL);
if (IS_ERR(hwmon->device)) {
result = PTR_ERR(hwmon->device);
goto free_mem;
}
+ dev_set_drvdata(hwmon->device, hwmon);
+ result = device_create_file(hwmon->device, &dev_attr_name);
+ if (result)
+ goto free_mem;
register_sys_interface:
temp = kzalloc(sizeof(*temp), GFP_KERNEL);
@@ -211,8 +222,10 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
free_temp_mem:
kfree(temp);
unregister_name:
- if (new_hwmon_device)
+ if (new_hwmon_device) {
+ device_remove_file(hwmon->device, &dev_attr_name);
hwmon_device_unregister(hwmon->device);
+ }
free_mem:
if (new_hwmon_device)
kfree(hwmon);
@@ -254,6 +267,7 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
list_del(&hwmon->node);
mutex_unlock(&thermal_hwmon_list_lock);
+ device_remove_file(hwmon->device, &dev_attr_name);
hwmon_device_unregister(hwmon->device);
kfree(hwmon);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()"
2017-01-23 15:13 [PATCH] Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()" Fabio Estevam
@ 2017-01-23 17:10 ` Guenter Roeck
2017-01-23 20:23 ` Pavel Machek
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2017-01-23 17:10 UTC (permalink / raw)
To: Fabio Estevam; +Cc: rui.zhang, pavel, linux-pm, Fabio Estevam
On Mon, Jan 23, 2017 at 01:13:58PM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> This reverts commit 7611fb68062f8d7f416f3272894d1edf7bbff29c.
>
> Pavel Machek reported breakage in the Nokia N900 due to this commit.
>
> We can revisit a proper fix for the warning later.
>
> Reported-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/thermal/thermal_hwmon.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
> index c4a508a..541af59 100644
> --- a/drivers/thermal/thermal_hwmon.c
> +++ b/drivers/thermal/thermal_hwmon.c
> @@ -59,6 +59,14 @@ static LIST_HEAD(thermal_hwmon_list);
> static DEFINE_MUTEX(thermal_hwmon_list_lock);
>
> static ssize_t
> +name_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
> + return sprintf(buf, "%s\n", hwmon->type);
> +}
> +static DEVICE_ATTR_RO(name);
> +
> +static ssize_t
> temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
> {
> int temperature;
> @@ -157,12 +165,15 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
>
> INIT_LIST_HEAD(&hwmon->tz_list);
> strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
> - hwmon->device = hwmon_device_register_with_info(NULL, hwmon->type,
> - hwmon, NULL, NULL);
> + hwmon->device = hwmon_device_register(NULL);
> if (IS_ERR(hwmon->device)) {
> result = PTR_ERR(hwmon->device);
> goto free_mem;
> }
> + dev_set_drvdata(hwmon->device, hwmon);
> + result = device_create_file(hwmon->device, &dev_attr_name);
> + if (result)
> + goto free_mem;
>
> register_sys_interface:
> temp = kzalloc(sizeof(*temp), GFP_KERNEL);
> @@ -211,8 +222,10 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
> free_temp_mem:
> kfree(temp);
> unregister_name:
> - if (new_hwmon_device)
> + if (new_hwmon_device) {
> + device_remove_file(hwmon->device, &dev_attr_name);
> hwmon_device_unregister(hwmon->device);
> + }
> free_mem:
> if (new_hwmon_device)
> kfree(hwmon);
> @@ -254,6 +267,7 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> list_del(&hwmon->node);
> mutex_unlock(&thermal_hwmon_list_lock);
>
> + device_remove_file(hwmon->device, &dev_attr_name);
> hwmon_device_unregister(hwmon->device);
> kfree(hwmon);
> }
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()"
2017-01-23 17:10 ` Guenter Roeck
@ 2017-01-23 20:23 ` Pavel Machek
0 siblings, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2017-01-23 20:23 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Fabio Estevam, rui.zhang, linux-pm, Fabio Estevam
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
On Mon 2017-01-23 09:10:36, Guenter Roeck wrote:
> On Mon, Jan 23, 2017 at 01:13:58PM -0200, Fabio Estevam wrote:
> > From: Fabio Estevam <fabio.estevam@nxp.com>
> >
> > This reverts commit 7611fb68062f8d7f416f3272894d1edf7bbff29c.
> >
> > Pavel Machek reported breakage in the Nokia N900 due to this commit.
> >
> > We can revisit a proper fix for the warning later.
> >
> > Reported-by: Pavel Machek <pavel@ucw.cz>
> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>
> Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-23 20:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-23 15:13 [PATCH] Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()" Fabio Estevam
2017-01-23 17:10 ` Guenter Roeck
2017-01-23 20:23 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).