Skip to content

Commit

Permalink
hwmon: (w83627ehf) mark const init data with __initconst instead of _…
Browse files Browse the repository at this point in the history
…_initdata

As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with

	error: $variablename causes a section type conflict

because a section containing const variables is marked read only and so
cannot contain non-const variables.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: lm-sensors@lm-sensors.org
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  • Loading branch information
Uwe Kleine-König authored and Guenter Roeck committed Apr 1, 2012
1 parent 31e354e commit 6f7805a
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/hwmon/w83627ehf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2619,15 +2619,15 @@ static struct platform_driver w83627ehf_driver = {
static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
struct w83627ehf_sio_data *sio_data)
{
static const char __initdata sio_name_W83627EHF[] = "W83627EHF";
static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
static const char __initdata sio_name_W83627DHG_P[] = "W83627DHG-P";
static const char __initdata sio_name_W83627UHG[] = "W83627UHG";
static const char __initdata sio_name_W83667HG[] = "W83667HG";
static const char __initdata sio_name_W83667HG_B[] = "W83667HG-B";
static const char __initdata sio_name_NCT6775[] = "NCT6775F";
static const char __initdata sio_name_NCT6776[] = "NCT6776F";
static const char sio_name_W83627EHF[] __initconst = "W83627EHF";
static const char sio_name_W83627EHG[] __initconst = "W83627EHG";
static const char sio_name_W83627DHG[] __initconst = "W83627DHG";
static const char sio_name_W83627DHG_P[] __initconst = "W83627DHG-P";
static const char sio_name_W83627UHG[] __initconst = "W83627UHG";
static const char sio_name_W83667HG[] __initconst = "W83667HG";
static const char sio_name_W83667HG_B[] __initconst = "W83667HG-B";
static const char sio_name_NCT6775[] __initconst = "NCT6775F";
static const char sio_name_NCT6776[] __initconst = "NCT6776F";

u16 val;
const char *sio_name;
Expand Down

0 comments on commit 6f7805a

Please sign in to comment.