Re: [PATCH v2] thermal: thermal_sys: Fix build warning

[Andrew Morton]

On Sun, 22 Jan 2012 14:46:01 -0200
Fabio Estevam <festevam@xxxxxxxxx> wrote:

> Fix the following build warning:
> 
> drivers/thermal/thermal_sys.c:63: warning: 'thermal_event_seqnum' defined but not used
> 
> ,which happens when CONFIG_NET is not set.
> 
> Move 'thermal_event_seqnum' definition inside the '#ifdef CONFIG_NET'
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
> ---
> Change since v1:
> - Sent corrupted patch in v1, and fixed now
>  drivers/thermal/thermal_sys.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index dd9a574..11f5955 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -60,8 +60,6 @@ static LIST_HEAD(thermal_tz_list);
>  static LIST_HEAD(thermal_cdev_list);
>  static DEFINE_MUTEX(thermal_list_lock);
>  
> -static unsigned int thermal_event_seqnum;
> -
>  static int get_idr(struct idr *idr, struct mutex *lock, int *id)
>  {
>  	int err;
> @@ -1304,6 +1302,8 @@ static struct genl_multicast_group thermal_event_mcgrp = {
>  	.name = THERMAL_GENL_MCAST_GROUP_NAME,
>  };
>  
> +static unsigned int thermal_event_seqnum;
> +
>  int generate_netlink_event(u32 orig, enum events event)
>  {
>  	struct sk_buff *skb;

It is better to make this variable local to the (only) function which
uses it:

--- a/drivers/thermal/thermal_sys.c~thermal-thermal_sys-fix-build-warning-fix
+++ a/drivers/thermal/thermal_sys.c
@@ -1302,8 +1302,6 @@ static struct genl_multicast_group therm
 	.name = THERMAL_GENL_MCAST_GROUP_NAME,
 };
 
-static unsigned int thermal_event_seqnum;
-
 int thermal_generate_netlink_event(u32 orig, enum events event)
 {
 	struct sk_buff *skb;
@@ -1312,6 +1310,7 @@ int thermal_generate_netlink_event(u32 o
 	void *msg_header;
 	int size;
 	int result;
+	static unsigned int thermal_event_seqnum;
 
 	/* allocate memory */
 	size = nla_total_size(sizeof(struct thermal_genl_event)) + \
_

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/