diff mbox series

thermal: sun8i: Add hwmon support

Message ID 20191228171904.24618-1-tiny.windzz@gmail.com (mailing list archive)
State Mainlined
Commit 85f0ad221317c18e6032b6735f6b36c8a6a96ea9
Headers show
Series thermal: sun8i: Add hwmon support | expand

Commit Message

Yangtao Li Dec. 28, 2019, 5:19 p.m. UTC
Expose sun8i thermal as a HWMON device.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/thermal/sun8i_thermal.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Chen-Yu Tsai Jan. 6, 2020, 4:31 a.m. UTC | #1
On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
>
> Expose sun8i thermal as a HWMON device.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
>  drivers/thermal/sun8i_thermal.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> index 23a5f4aa4be4..619e75cb41b0 100644
> --- a/drivers/thermal/sun8i_thermal.c
> +++ b/drivers/thermal/sun8i_thermal.c
> @@ -20,6 +20,8 @@
>  #include <linux/slab.h>
>  #include <linux/thermal.h>
>
> +#include "thermal_hwmon.h"
> +
>  #define MAX_SENSOR_NUM 4
>
>  #define FT_TEMP_MASK                           GENMASK(11, 0)
> @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
>                                                              &ths_ops);
>                 if (IS_ERR(tmdev->sensor[i].tzd))
>                         return PTR_ERR(tmdev->sensor[i].tzd);
> +
> +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
> +                       dev_warn(tmdev->dev,
> +                                "Failed to add hwmon sysfs attributes\n");

Maybe you want a hard failure instead?

ChenYu

>         }
>
>         return 0;
> --
> 2.17.1
>
Yangtao Li Jan. 6, 2020, 4:14 p.m. UTC | #2
HI Chen-Yu.

On Mon, Jan 6, 2020 at 12:32 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
> >
> > Expose sun8i thermal as a HWMON device.
> >
> > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> > ---
> >  drivers/thermal/sun8i_thermal.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> > index 23a5f4aa4be4..619e75cb41b0 100644
> > --- a/drivers/thermal/sun8i_thermal.c
> > +++ b/drivers/thermal/sun8i_thermal.c
> > @@ -20,6 +20,8 @@
> >  #include <linux/slab.h>
> >  #include <linux/thermal.h>
> >
> > +#include "thermal_hwmon.h"
> > +
> >  #define MAX_SENSOR_NUM 4
> >
> >  #define FT_TEMP_MASK                           GENMASK(11, 0)
> > @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
> >                                                              &ths_ops);
> >                 if (IS_ERR(tmdev->sensor[i].tzd))
> >                         return PTR_ERR(tmdev->sensor[i].tzd);
> > +
> > +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
> > +                       dev_warn(tmdev->dev,
> > +                                "Failed to add hwmon sysfs attributes\n");
>
> Maybe you want a hard failure instead?

I don't quite understand what you mean.
What do you think should be done?

MBR,
Yangtao

>
> ChenYu
>
> >         }
> >
> >         return 0;
> > --
> > 2.17.1
> >
Chen-Yu Tsai Jan. 7, 2020, 3:15 a.m. UTC | #3
On Tue, Jan 7, 2020 at 12:14 AM Frank Lee <tiny.windzz@gmail.com> wrote:
>
> HI Chen-Yu.
>
> On Mon, Jan 6, 2020 at 12:32 PM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
> > >
> > > Expose sun8i thermal as a HWMON device.
> > >
> > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> > > ---
> > >  drivers/thermal/sun8i_thermal.c | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > >
> > > diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> > > index 23a5f4aa4be4..619e75cb41b0 100644
> > > --- a/drivers/thermal/sun8i_thermal.c
> > > +++ b/drivers/thermal/sun8i_thermal.c
> > > @@ -20,6 +20,8 @@
> > >  #include <linux/slab.h>
> > >  #include <linux/thermal.h>
> > >
> > > +#include "thermal_hwmon.h"
> > > +
> > >  #define MAX_SENSOR_NUM 4
> > >
> > >  #define FT_TEMP_MASK                           GENMASK(11, 0)
> > > @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
> > >                                                              &ths_ops);
> > >                 if (IS_ERR(tmdev->sensor[i].tzd))
> > >                         return PTR_ERR(tmdev->sensor[i].tzd);
> > > +
> > > +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
> > > +                       dev_warn(tmdev->dev,
> > > +                                "Failed to add hwmon sysfs attributes\n");
> >
> > Maybe you want a hard failure instead?
>
> I don't quite understand what you mean.
> What do you think should be done?

Return an error instead of just printing a warning.

ChenYu

> MBR,
> Yangtao
>
> >
> > ChenYu
> >
> > >         }
> > >
> > >         return 0;
> > > --
> > > 2.17.1
> > >
Yangtao Li Jan. 11, 2020, 6:08 p.m. UTC | #4
On Tue, Jan 7, 2020 at 11:15 AM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Tue, Jan 7, 2020 at 12:14 AM Frank Lee <tiny.windzz@gmail.com> wrote:
> >
> > HI Chen-Yu.
> >
> > On Mon, Jan 6, 2020 at 12:32 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > >
> > > On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
> > > >
> > > > Expose sun8i thermal as a HWMON device.
> > > >
> > > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> > > > ---
> > > >  drivers/thermal/sun8i_thermal.c | 6 ++++++
> > > >  1 file changed, 6 insertions(+)
> > > >
> > > > diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> > > > index 23a5f4aa4be4..619e75cb41b0 100644
> > > > --- a/drivers/thermal/sun8i_thermal.c
> > > > +++ b/drivers/thermal/sun8i_thermal.c
> > > > @@ -20,6 +20,8 @@
> > > >  #include <linux/slab.h>
> > > >  #include <linux/thermal.h>
> > > >
> > > > +#include "thermal_hwmon.h"
> > > > +
> > > >  #define MAX_SENSOR_NUM 4
> > > >
> > > >  #define FT_TEMP_MASK                           GENMASK(11, 0)
> > > > @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
> > > >                                                              &ths_ops);
> > > >                 if (IS_ERR(tmdev->sensor[i].tzd))
> > > >                         return PTR_ERR(tmdev->sensor[i].tzd);
> > > > +
> > > > +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
> > > > +                       dev_warn(tmdev->dev,
> > > > +                                "Failed to add hwmon sysfs attributes\n");
> > >
> > > Maybe you want a hard failure instead?
> >
> > I don't quite understand what you mean.
> > What do you think should be done?
>
> Return an error instead of just printing a warning.

Sometimes, even if hwmon fails to add, it can still work as a thermal driver.
At this time, I don't really want to interrupt the registration of the
thermal driver.

Anyone else's opinion here?

Yours,
Ynagtao

>
> ChenYu
>
> > MBR,
> > Yangtao
> >
> > >
> > > ChenYu
> > >
> > > >         }
> > > >
> > > >         return 0;
> > > > --
> > > > 2.17.1
> > > >
Yangtao Li Jan. 12, 2020, 6:12 p.m. UTC | #5
HI Daniel:

On Sun, Jan 12, 2020 at 2:08 AM Frank Lee <tiny.windzz@gmail.com> wrote:
>
> On Tue, Jan 7, 2020 at 11:15 AM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > On Tue, Jan 7, 2020 at 12:14 AM Frank Lee <tiny.windzz@gmail.com> wrote:
> > >
> > > HI Chen-Yu.
> > >
> > > On Mon, Jan 6, 2020 at 12:32 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > > >
> > > > On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
> > > > >
> > > > > Expose sun8i thermal as a HWMON device.
> > > > >
> > > > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> > > > > ---
> > > > >  drivers/thermal/sun8i_thermal.c | 6 ++++++
> > > > >  1 file changed, 6 insertions(+)
> > > > >
> > > > > diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> > > > > index 23a5f4aa4be4..619e75cb41b0 100644
> > > > > --- a/drivers/thermal/sun8i_thermal.c
> > > > > +++ b/drivers/thermal/sun8i_thermal.c
> > > > > @@ -20,6 +20,8 @@
> > > > >  #include <linux/slab.h>
> > > > >  #include <linux/thermal.h>
> > > > >
> > > > > +#include "thermal_hwmon.h"
> > > > > +
> > > > >  #define MAX_SENSOR_NUM 4
> > > > >
> > > > >  #define FT_TEMP_MASK                           GENMASK(11, 0)
> > > > > @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
> > > > >                                                              &ths_ops);
> > > > >                 if (IS_ERR(tmdev->sensor[i].tzd))
> > > > >                         return PTR_ERR(tmdev->sensor[i].tzd);
> > > > > +
> > > > > +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
> > > > > +                       dev_warn(tmdev->dev,
> > > > > +                                "Failed to add hwmon sysfs attributes\n");
> > > >
> > > > Maybe you want a hard failure instead?
> > >
> > > I don't quite understand what you mean.
> > > What do you think should be done?
> >
> > Return an error instead of just printing a warning.
>
> Sometimes, even if hwmon fails to add, it can still work as a thermal driver.
> At this time, I don't really want to interrupt the registration of the
> thermal driver.
>
> Anyone else's opinion here?
>

What's your point? Can you choose this patch?

MBR,
Yangtao
Daniel Lezcano Jan. 12, 2020, 7:31 p.m. UTC | #6
On 12/01/2020 19:12, Frank Lee wrote:
> HI Daniel:
> 
> On Sun, Jan 12, 2020 at 2:08 AM Frank Lee <tiny.windzz@gmail.com> wrote:
>>
>> On Tue, Jan 7, 2020 at 11:15 AM Chen-Yu Tsai <wens@csie.org> wrote:
>>>
>>> On Tue, Jan 7, 2020 at 12:14 AM Frank Lee <tiny.windzz@gmail.com> wrote:
>>>>
>>>> HI Chen-Yu.
>>>>
>>>> On Mon, Jan 6, 2020 at 12:32 PM Chen-Yu Tsai <wens@csie.org> wrote:
>>>>>
>>>>> On Sun, Dec 29, 2019 at 1:19 AM Yangtao Li <tiny.windzz@gmail.com> wrote:
>>>>>>
>>>>>> Expose sun8i thermal as a HWMON device.
>>>>>>
>>>>>> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
>>>>>> ---
>>>>>>  drivers/thermal/sun8i_thermal.c | 6 ++++++
>>>>>>  1 file changed, 6 insertions(+)
>>>>>>
>>>>>> diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
>>>>>> index 23a5f4aa4be4..619e75cb41b0 100644
>>>>>> --- a/drivers/thermal/sun8i_thermal.c
>>>>>> +++ b/drivers/thermal/sun8i_thermal.c
>>>>>> @@ -20,6 +20,8 @@
>>>>>>  #include <linux/slab.h>
>>>>>>  #include <linux/thermal.h>
>>>>>>
>>>>>> +#include "thermal_hwmon.h"
>>>>>> +
>>>>>>  #define MAX_SENSOR_NUM 4
>>>>>>
>>>>>>  #define FT_TEMP_MASK                           GENMASK(11, 0)
>>>>>> @@ -477,6 +479,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
>>>>>>                                                              &ths_ops);
>>>>>>                 if (IS_ERR(tmdev->sensor[i].tzd))
>>>>>>                         return PTR_ERR(tmdev->sensor[i].tzd);
>>>>>> +
>>>>>> +               if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
>>>>>> +                       dev_warn(tmdev->dev,
>>>>>> +                                "Failed to add hwmon sysfs attributes\n");
>>>>>
>>>>> Maybe you want a hard failure instead?
>>>>
>>>> I don't quite understand what you mean.
>>>> What do you think should be done?
>>>
>>> Return an error instead of just printing a warning.
>>
>> Sometimes, even if hwmon fails to add, it can still work as a thermal driver.
>> At this time, I don't really want to interrupt the registration of the
>> thermal driver.
>>
>> Anyone else's opinion here?
>>
> 
> What's your point? Can you choose this patch?

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index 23a5f4aa4be4..619e75cb41b0 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -20,6 +20,8 @@ 
 #include <linux/slab.h>
 #include <linux/thermal.h>
 
+#include "thermal_hwmon.h"
+
 #define MAX_SENSOR_NUM	4
 
 #define FT_TEMP_MASK				GENMASK(11, 0)
@@ -477,6 +479,10 @@  static int sun8i_ths_register(struct ths_device *tmdev)
 							     &ths_ops);
 		if (IS_ERR(tmdev->sensor[i].tzd))
 			return PTR_ERR(tmdev->sensor[i].tzd);
+
+		if (devm_thermal_add_hwmon_sysfs(tmdev->sensor[i].tzd))
+			dev_warn(tmdev->dev,
+				 "Failed to add hwmon sysfs attributes\n");
 	}
 
 	return 0;