From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759619Ab2C2VPQ (ORCPT ); Thu, 29 Mar 2012 17:15:16 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:33815 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933930Ab2C2VNA (ORCPT ); Thu, 29 Mar 2012 17:13:00 -0400 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-kernel@vger.kernel.org, Andrew Morton Cc: kernel@pengutronix.de, Jean Delvare , Guenter Roeck , lm-sensors@lm-sensors.org Subject: [PATCH 06/17] hwmon: mark const init data with __initconst instead of __initdata Date: Thu, 29 Mar 2012 23:12:23 +0200 Message-Id: <1333055554-31300-6-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <20120329211131.GA31250@pengutronix.de> References: <20120329211131.GA31250@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Jean Delvare Cc: Guenter Roeck Cc: lm-sensors@lm-sensors.org --- drivers/hwmon/w83627ehf.c | 18 +++++++++--------- drivers/hwmon/w83627hf.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index a25350c..54922ed 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -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; diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index 5ce54a2..aaf67ff 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c @@ -1206,7 +1206,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, int err = -ENODEV; u16 val; - static const __initdata char *names[] = { + static const char *names[] __initconst = { "W83627HF", "W83627THF", "W83697HF", -- 1.7.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 29 Mar 2012 21:12:23 +0000 Subject: [lm-sensors] [PATCH 06/17] hwmon: mark const init data with __initconst instead of __initdata Message-Id: <1333055554-31300-6-git-send-email-u.kleine-koenig@pengutronix.de> List-Id: References: <20120329211131.GA31250@pengutronix.de> In-Reply-To: <20120329211131.GA31250@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, Andrew Morton Cc: kernel@pengutronix.de, Jean Delvare , Guenter Roeck , lm-sensors@lm-sensors.org QXMgbG9uZyBhcyB0aGVyZSBpcyBubyBvdGhlciBub24tY29uc3QgdmFyaWFibGUgbWFya2VkIF9f aW5pdGRhdGEgaW4gdGhlCnNhbWUgY29tcGlsYXRpb24gdW5pdCBpdCBkb2Vzbid0IGh1cnQuIElm IHRoZXJlIHdlcmUgb25lIGhvd2V2ZXIKY29tcGlsYXRpb24gd291bGQgZmFpbCB3aXRoCgoJZXJy b3I6ICR2YXJpYWJsZW5hbWUgY2F1c2VzIGEgc2VjdGlvbiB0eXBlIGNvbmZsaWN0CgpiZWNhdXNl IGEgc2VjdGlvbiBjb250YWluaW5nIGNvbnN0IHZhcmlhYmxlcyBpcyBtYXJrZWQgcmVhZCBvbmx5 IGFuZCBzbwpjYW5ub3QgY29udGFpbiBub24tY29uc3QgdmFyaWFibGVzLgoKU2lnbmVkLW9mZi1i eTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KQ2M6 IEplYW4gRGVsdmFyZSA8a2hhbGlAbGludXgtZnIub3JnPgpDYzogR3VlbnRlciBSb2VjayA8Z3Vl bnRlci5yb2Vja0Blcmljc3Nvbi5jb20+CkNjOiBsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCi0t LQogZHJpdmVycy9od21vbi93ODM2MjdlaGYuYyB8ICAgMTggKysrKysrKysrLS0tLS0tLS0tCiBk cml2ZXJzL2h3bW9uL3c4MzYyN2hmLmMgIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBp bnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2h3bW9u L3c4MzYyN2VoZi5jIGIvZHJpdmVycy9od21vbi93ODM2MjdlaGYuYwppbmRleCBhMjUzNTBjLi41 NDkyMmVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2h3bW9uL3c4MzYyN2VoZi5jCisrKyBiL2RyaXZl cnMvaHdtb24vdzgzNjI3ZWhmLmMKQEAgLTI2MTksMTUgKzI2MTksMTUgQEAgc3RhdGljIHN0cnVj dCBwbGF0Zm9ybV9kcml2ZXIgdzgzNjI3ZWhmX2RyaXZlciA9IHsKIHN0YXRpYyBpbnQgX19pbml0 IHc4MzYyN2VoZl9maW5kKGludCBzaW9hZGRyLCB1bnNpZ25lZCBzaG9ydCAqYWRkciwKIAkJCQkg c3RydWN0IHc4MzYyN2VoZl9zaW9fZGF0YSAqc2lvX2RhdGEpCiB7Ci0Jc3RhdGljIGNvbnN0IGNo YXIgX19pbml0ZGF0YSBzaW9fbmFtZV9XODM2MjdFSEZbXSA9ICJXODM2MjdFSEYiOwotCXN0YXRp YyBjb25zdCBjaGFyIF9faW5pdGRhdGEgc2lvX25hbWVfVzgzNjI3RUhHW10gPSAiVzgzNjI3RUhH IjsKLQlzdGF0aWMgY29uc3QgY2hhciBfX2luaXRkYXRhIHNpb19uYW1lX1c4MzYyN0RIR1tdID0g Ilc4MzYyN0RIRyI7Ci0Jc3RhdGljIGNvbnN0IGNoYXIgX19pbml0ZGF0YSBzaW9fbmFtZV9XODM2 MjdESEdfUFtdID0gIlc4MzYyN0RIRy1QIjsKLQlzdGF0aWMgY29uc3QgY2hhciBfX2luaXRkYXRh IHNpb19uYW1lX1c4MzYyN1VIR1tdID0gIlc4MzYyN1VIRyI7Ci0Jc3RhdGljIGNvbnN0IGNoYXIg X19pbml0ZGF0YSBzaW9fbmFtZV9XODM2NjdIR1tdID0gIlc4MzY2N0hHIjsKLQlzdGF0aWMgY29u c3QgY2hhciBfX2luaXRkYXRhIHNpb19uYW1lX1c4MzY2N0hHX0JbXSA9ICJXODM2NjdIRy1CIjsK LQlzdGF0aWMgY29uc3QgY2hhciBfX2luaXRkYXRhIHNpb19uYW1lX05DVDY3NzVbXSA9ICJOQ1Q2 Nzc1RiI7Ci0Jc3RhdGljIGNvbnN0IGNoYXIgX19pbml0ZGF0YSBzaW9fbmFtZV9OQ1Q2Nzc2W10g PSAiTkNUNjc3NkYiOworCXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1lX1c4MzYyN0VIRltdIF9f aW5pdGNvbnN0ID0gIlc4MzYyN0VIRiI7CisJc3RhdGljIGNvbnN0IGNoYXIgc2lvX25hbWVfVzgz NjI3RUhHW10gX19pbml0Y29uc3QgPSAiVzgzNjI3RUhHIjsKKwlzdGF0aWMgY29uc3QgY2hhciBz aW9fbmFtZV9XODM2MjdESEdbXSBfX2luaXRjb25zdCA9ICJXODM2MjdESEciOworCXN0YXRpYyBj b25zdCBjaGFyIHNpb19uYW1lX1c4MzYyN0RIR19QW10gX19pbml0Y29uc3QgPSAiVzgzNjI3REhH LVAiOworCXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1lX1c4MzYyN1VIR1tdIF9faW5pdGNvbnN0 ID0gIlc4MzYyN1VIRyI7CisJc3RhdGljIGNvbnN0IGNoYXIgc2lvX25hbWVfVzgzNjY3SEdbXSBf X2luaXRjb25zdCA9ICJXODM2NjdIRyI7CisJc3RhdGljIGNvbnN0IGNoYXIgc2lvX25hbWVfVzgz NjY3SEdfQltdIF9faW5pdGNvbnN0ID0gIlc4MzY2N0hHLUIiOworCXN0YXRpYyBjb25zdCBjaGFy IHNpb19uYW1lX05DVDY3NzVbXSBfX2luaXRjb25zdCA9ICJOQ1Q2Nzc1RiI7CisJc3RhdGljIGNv bnN0IGNoYXIgc2lvX25hbWVfTkNUNjc3NltdIF9faW5pdGNvbnN0ID0gIk5DVDY3NzZGIjsKIAog CXUxNiB2YWw7CiAJY29uc3QgY2hhciAqc2lvX25hbWU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2h3 bW9uL3c4MzYyN2hmLmMgYi9kcml2ZXJzL2h3bW9uL3c4MzYyN2hmLmMKaW5kZXggNWNlNTRhMi4u YWFmNjdmZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9od21vbi93ODM2MjdoZi5jCisrKyBiL2RyaXZl cnMvaHdtb24vdzgzNjI3aGYuYwpAQCAtMTIwNiw3ICsxMjA2LDcgQEAgc3RhdGljIGludCBfX2lu aXQgdzgzNjI3aGZfZmluZChpbnQgc2lvYWRkciwgdW5zaWduZWQgc2hvcnQgKmFkZHIsCiAJaW50 IGVyciA9IC1FTk9ERVY7CiAJdTE2IHZhbDsKIAotCXN0YXRpYyBjb25zdCBfX2luaXRkYXRhIGNo YXIgKm5hbWVzW10gPSB7CisJc3RhdGljIGNvbnN0IGNoYXIgKm5hbWVzW10gX19pbml0Y29uc3Qg PSB7CiAJCSJXODM2MjdIRiIsCiAJCSJXODM2MjdUSEYiLAogCQkiVzgzNjk3SEYiLAotLSAKMS43 LjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxt LXNlbnNvcnMgbWFpbGluZyBsaXN0CmxtLXNlbnNvcnNAbG0tc2Vuc29ycy5vcmcKaHR0cDovL2xp c3RzLmxtLXNlbnNvcnMub3JnL21haWxtYW4vbGlzdGluZm8vbG0tc2Vuc29ycw=