Re: [PATCH RESEND 1/4] thermal: Use thermal zone device id in netlink messages

[Eduardo Valentin <eduardo.valentin@ti.com>]

Hello,

On 02-01-2013 17:48, R, Durgadoss wrote:
>> -----Original Message-----
>> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
>> owner@vger.kernel.org] On Behalf Of Eduardo Valentin
>> Sent: Wednesday, January 02, 2013 9:00 PM
>> To: Zhang, Rui
>> Cc: R, Durgadoss; linux-pm@lists.linux-foundation.org; linux-
>> pm@vger.kernel.org; Eduardo Valentin
>> Subject: [PATCH RESEND 1/4] thermal: Use thermal zone device id in netlink
>> messages
>>
>> This patch changes the function thermal_generate_netlink_event
>> to receive a thermal zone device instead of a originator id.
>>
>> This way, the messages will always be bound to a thermal zone.
>
> As you have mentioned, we are planning to deprecate this API.
> But, for now, this change is Ok :-)

Good.

>
> And I believe all these four patches are on Rui's tree ?

They are not :-(

>
>>
>
> Reviewed-by: Durgadoss R <durgadoss.r@intel.com>
>
>> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
>> ---
>>   Documentation/thermal/sysfs-api.txt |    5 +++--
>>   drivers/thermal/thermal_sys.c       |    8 ++++++--
>>   include/linux/thermal.h             |    6 ++++--
>>   3 files changed, 13 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/thermal/sysfs-api.txt
>> b/Documentation/thermal/sysfs-api.txt
>> index 88c0233..526d4b9 100644
>> --- a/Documentation/thermal/sysfs-api.txt
>> +++ b/Documentation/thermal/sysfs-api.txt
>> @@ -329,8 +329,9 @@ The framework includes a simple notification
>> mechanism, in the form of a
>>   netlink event. Netlink socket initialization is done during the _init_
>>   of the framework. Drivers which intend to use the notification mechanism
>>   just need to call thermal_generate_netlink_event() with two arguments viz
>> -(originator, event). Typically the originator will be an integer assigned
>> -to a thermal_zone_device when it registers itself with the framework. The
>> +(originator, event). The originator is a pointer to struct
>> thermal_zone_device
>> +from where the event has been originated. An integer which represents
>> the
>> +thermal zone device will be used in the message to identify the zone. The
>>   event will be one of:{THERMAL_AUX0, THERMAL_AUX1,
>> THERMAL_CRITICAL,
>>   THERMAL_DEV_FAULT}. Notification can be sent when the current
>> temperature
>>   crosses any of the configured thresholds.
>> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
>> index 8c8ce80..d85f51f 100644
>> --- a/drivers/thermal/thermal_sys.c
>> +++ b/drivers/thermal/thermal_sys.c
>> @@ -1711,7 +1711,8 @@ static struct genl_multicast_group
>> thermal_event_mcgrp = {
>>   	.name = THERMAL_GENL_MCAST_GROUP_NAME,
>>   };
>>
>> -int thermal_generate_netlink_event(u32 orig, enum events event)
>> +int thermal_generate_netlink_event(struct thermal_zone_device *tz,
>> +					enum events event)
>>   {
>>   	struct sk_buff *skb;
>>   	struct nlattr *attr;
>> @@ -1721,6 +1722,9 @@ int thermal_generate_netlink_event(u32 orig,
>> enum events event)
>>   	int result;
>>   	static unsigned int thermal_event_seqnum;
>>
>> +	if (!tz)
>> +		return -EINVAL;
>> +
>>   	/* allocate memory */
>>   	size = nla_total_size(sizeof(struct thermal_genl_event)) +
>>   	       nla_total_size(0);
>> @@ -1755,7 +1759,7 @@ int thermal_generate_netlink_event(u32 orig,
>> enum events event)
>>
>>   	memset(thermal_event, 0, sizeof(struct thermal_genl_event));
>>
>> -	thermal_event->orig = orig;
>> +	thermal_event->orig = tz->id;
>>   	thermal_event->event = event;
>>
>>   	/* send multicast genetlink message */
>> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
>> index fe82022..e85ac70 100644
>> --- a/include/linux/thermal.h
>> +++ b/include/linux/thermal.h
>> @@ -244,9 +244,11 @@ int thermal_register_governor(struct
>> thermal_governor *);
>>   void thermal_unregister_governor(struct thermal_governor *);
>>
>>   #ifdef CONFIG_NET
>> -extern int thermal_generate_netlink_event(u32 orig, enum events event);
>> +extern int thermal_generate_netlink_event(struct thermal_zone_device
>> *tz,
>> +						enum events event);
>>   #else
>> -static inline int thermal_generate_netlink_event(u32 orig, enum events
>> event)
>> +static int thermal_generate_netlink_event(struct thermal_zone_device
>> *tz,
>> +						enum events event)
>>   {
>>   	return 0;
>>   }
>> --
>> 1.7.7.1.488.ge8e1c
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html