From patchwork Thu Jan 13 11:14:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 475531 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0DBEHSv014592 for ; Thu, 13 Jan 2011 11:14:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756600Ab1AMLOR (ORCPT ); Thu, 13 Jan 2011 06:14:17 -0500 Received: from cantor.suse.de ([195.135.220.2]:53166 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756577Ab1AMLOQ (ORCPT ); Thu, 13 Jan 2011 06:14:16 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id C285393717; Thu, 13 Jan 2011 12:14:15 +0100 (CET) From: Thomas Renninger Organization: SUSE Products GmbH To: Len Brown Subject: Re: [PATCH 28/48] thermal: Add event notification to thermal framework Date: Thu, 13 Jan 2011 12:14:14 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.36-18-desktop; KDE/4.5.3; x86_64; ; ) Cc: linux-acpi@vger.kernel.org, "R.Durgadoss" References: <1294827582-4620-1-git-send-email-lenb@kernel.org> <4cb18728709683c91a5f6f8d5f337bfb498b089a.1294827492.git.len.brown@intel.com> <201101131207.01290.trenn@suse.de> In-Reply-To: <201101131207.01290.trenn@suse.de> MIME-Version: 1.0 Message-Id: <201101131214.14677.trenn@suse.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 13 Jan 2011 11:14:18 +0000 (UTC) diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 5bbacff..02283f3 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -78,7 +78,7 @@ static struct genl_multicast_group thermal_event_mcgrp = { static int genetlink_init(void); static void genetlink_exit(void); -int generate_netlink_event(u32 orig, enum events event) +int thermal_netlink_event(u32 orig, enum events event) { struct sk_buff *skb; struct nlattr *attr; @@ -137,7 +137,7 @@ int generate_netlink_event(u32 orig, enum events event) return result; } -EXPORT_SYMBOL(generate_netlink_event); +EXPORT_SYMBOL(thermal_netlink_event); static int genetlink_init(void) { @@ -163,8 +163,8 @@ static void genetlink_exit(void) static void genetlink_exit(void) {}; static int genetlink_init(void) { return 0; } -int generate_netlink_event(u32 orig, enum events event) { return 0; } -EXPORT_SYMBOL(generate_netlink_event); +int thermal_netlink_event(u32 orig, enum events event) { return 0; } +EXPORT_SYMBOL(thermal_netlink_event); #endif /* CONFIG_NET */ diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 1c31614..c24756e 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -161,7 +161,7 @@ enum { }; #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) #endif -extern int generate_netlink_event(u32 orig, enum events event); +extern int thermal_netlink_event(u32 orig, enum events event); struct thermal_zone_device *thermal_zone_device_register(char *, int, void *, const struct thermal_zone_device_ops *, int tc1, int tc2,