From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934721Ab2C3UHY (ORCPT ); Fri, 30 Mar 2012 16:07:24 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:53485 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934637Ab2C3UFl (ORCPT ); Fri, 30 Mar 2012 16:05:41 -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 v2 05/15] hwmon: mark const init data with __initconst instead of __initdata Date: Fri, 30 Mar 2012 22:04:55 +0200 Message-Id: <1333137905-13809-5-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20120330200358.GV15647@pengutronix.de> References: <20120330200358.GV15647@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 --- changes since (implicit) v1: - drop wrong changes to drivers/hwmon/w83627hf.c drivers/hwmon/w83627ehf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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; -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 30 Mar 2012 20:04:55 +0000 Subject: [lm-sensors] [PATCH v2 05/15] hwmon: mark const init data with __initconst instead of __initdata Message-Id: <1333137905-13809-5-git-send-email-u.kleine-koenig@pengutronix.de> List-Id: References: <20120330200358.GV15647@pengutronix.de> In-Reply-To: <20120330200358.GV15647@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 LQpjaGFuZ2VzIHNpbmNlIChpbXBsaWNpdCkgdjE6CiAtIGRyb3Agd3JvbmcgY2hhbmdlcyB0byBk cml2ZXJzL2h3bW9uL3c4MzYyN2hmLmMKCiBkcml2ZXJzL2h3bW9uL3c4MzYyN2VoZi5jIHwgICAx OCArKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9od21vbi93ODM2MjdlaGYuYyBiL2Ry aXZlcnMvaHdtb24vdzgzNjI3ZWhmLmMKaW5kZXggYTI1MzUwYy4uNTQ5MjJlZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9od21vbi93ODM2MjdlaGYuYworKysgYi9kcml2ZXJzL2h3bW9uL3c4MzYyN2Vo Zi5jCkBAIC0yNjE5LDE1ICsyNjE5LDE1IEBAIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVy IHc4MzYyN2VoZl9kcml2ZXIgPSB7CiBzdGF0aWMgaW50IF9faW5pdCB3ODM2MjdlaGZfZmluZChp bnQgc2lvYWRkciwgdW5zaWduZWQgc2hvcnQgKmFkZHIsCiAJCQkJIHN0cnVjdCB3ODM2MjdlaGZf c2lvX2RhdGEgKnNpb19kYXRhKQogewotCXN0YXRpYyBjb25zdCBjaGFyIF9faW5pdGRhdGEgc2lv X25hbWVfVzgzNjI3RUhGW10gPSAiVzgzNjI3RUhGIjsKLQlzdGF0aWMgY29uc3QgY2hhciBfX2lu aXRkYXRhIHNpb19uYW1lX1c4MzYyN0VIR1tdID0gIlc4MzYyN0VIRyI7Ci0Jc3RhdGljIGNvbnN0 IGNoYXIgX19pbml0ZGF0YSBzaW9fbmFtZV9XODM2MjdESEdbXSA9ICJXODM2MjdESEciOwotCXN0 YXRpYyBjb25zdCBjaGFyIF9faW5pdGRhdGEgc2lvX25hbWVfVzgzNjI3REhHX1BbXSA9ICJXODM2 MjdESEctUCI7Ci0Jc3RhdGljIGNvbnN0IGNoYXIgX19pbml0ZGF0YSBzaW9fbmFtZV9XODM2MjdV SEdbXSA9ICJXODM2MjdVSEciOwotCXN0YXRpYyBjb25zdCBjaGFyIF9faW5pdGRhdGEgc2lvX25h bWVfVzgzNjY3SEdbXSA9ICJXODM2NjdIRyI7Ci0Jc3RhdGljIGNvbnN0IGNoYXIgX19pbml0ZGF0 YSBzaW9fbmFtZV9XODM2NjdIR19CW10gPSAiVzgzNjY3SEctQiI7Ci0Jc3RhdGljIGNvbnN0IGNo YXIgX19pbml0ZGF0YSBzaW9fbmFtZV9OQ1Q2Nzc1W10gPSAiTkNUNjc3NUYiOwotCXN0YXRpYyBj b25zdCBjaGFyIF9faW5pdGRhdGEgc2lvX25hbWVfTkNUNjc3NltdID0gIk5DVDY3NzZGIjsKKwlz dGF0aWMgY29uc3QgY2hhciBzaW9fbmFtZV9XODM2MjdFSEZbXSBfX2luaXRjb25zdCA9ICJXODM2 MjdFSEYiOworCXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1lX1c4MzYyN0VIR1tdIF9faW5pdGNv bnN0ID0gIlc4MzYyN0VIRyI7CisJc3RhdGljIGNvbnN0IGNoYXIgc2lvX25hbWVfVzgzNjI3REhH W10gX19pbml0Y29uc3QgPSAiVzgzNjI3REhHIjsKKwlzdGF0aWMgY29uc3QgY2hhciBzaW9fbmFt ZV9XODM2MjdESEdfUFtdIF9faW5pdGNvbnN0ID0gIlc4MzYyN0RIRy1QIjsKKwlzdGF0aWMgY29u c3QgY2hhciBzaW9fbmFtZV9XODM2MjdVSEdbXSBfX2luaXRjb25zdCA9ICJXODM2MjdVSEciOwor CXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1lX1c4MzY2N0hHW10gX19pbml0Y29uc3QgPSAiVzgz NjY3SEciOworCXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1lX1c4MzY2N0hHX0JbXSBfX2luaXRj b25zdCA9ICJXODM2NjdIRy1CIjsKKwlzdGF0aWMgY29uc3QgY2hhciBzaW9fbmFtZV9OQ1Q2Nzc1 W10gX19pbml0Y29uc3QgPSAiTkNUNjc3NUYiOworCXN0YXRpYyBjb25zdCBjaGFyIHNpb19uYW1l X05DVDY3NzZbXSBfX2luaXRjb25zdCA9ICJOQ1Q2Nzc2RiI7CiAKIAl1MTYgdmFsOwogCWNvbnN0 IGNoYXIgKnNpb19uYW1lOwotLSAKMS43LjkuNQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmxtLXNlbnNvcnMgbWFpbGluZyBsaXN0CmxtLXNlbnNvcnNA bG0tc2Vuc29ycy5vcmcKaHR0cDovL2xpc3RzLmxtLXNlbnNvcnMub3JnL21haWxtYW4vbGlzdGlu Zm8vbG0tc2Vuc29ycw=