[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120618081905.47d5cd33@endymion.delvare>
Date: Mon, 18 Jun 2012 08:19:05 +0200
From: Jean Delvare <khali@...ux-fr.org>
To: Anton Vorontsov <anton.vorontsov@...aro.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Len Brown <len.brown@...el.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] thermal: Constify 'type' argument for the registration
routine
On Sun, 17 Jun 2012 21:50:37 -0700, Anton Vorontsov wrote:
> thermal_zone_device_register() does not modify 'type' argument, so
> it is safe to declare it as const. Otherwise, if we pass a const
> string, we are getting the ugly warning:
>
> CC drivers/power/power_supply_core.o
> drivers/power/power_supply_core.c: In function 'psy_register_thermal':
> drivers/power/power_supply_core.c:204:6: warning: passing argument 1 of ‘thermal_zone_device_register’ discards 'const' qualifier from pointer target type [enabled by default]
> include/linux/thermal.h:140:29: note: expected 'char *' but argument is of type 'const char *'
>
> Signed-off-by: Anton Vorontsov <cbouatmailru@...il.com>
> ---
> drivers/thermal/thermal_sys.c | 2 +-
> include/linux/thermal.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index 022bacb..3bf68c9 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -1106,7 +1106,7 @@ EXPORT_SYMBOL(thermal_zone_device_update);
> * longer needed. The passive cooling formula uses tc1 and tc2 as described in
> * section 11.1.5.1 of the ACPI specification 3.0.
> */
> -struct thermal_zone_device *thermal_zone_device_register(char *type,
> +struct thermal_zone_device *thermal_zone_device_register(const char *type,
> int trips, void *devdata,
> const struct thermal_zone_device_ops *ops,
> int tc1, int tc2, int passive_delay, int polling_delay)
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index 796f1ff..ef75757 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -137,7 +137,8 @@ enum {
> };
> #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
>
> -struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
> +struct thermal_zone_device *
> +thermal_zone_device_register(const char *, int, void *,
> const struct thermal_zone_device_ops *, int tc1, int tc2,
> int passive_freq, int polling_freq);
> void thermal_zone_device_unregister(struct thermal_zone_device *);
Acked-by: Jean Delvare <khali@...ux-fr.org>
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists