From patchwork Mon Aug 12 09:14:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 2842913 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B663FBF546 for ; Mon, 12 Aug 2013 09:34:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB81E2020F for ; Mon, 12 Aug 2013 09:34:47 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92C552021A for ; Mon, 12 Aug 2013 09:34:42 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8oUs-0004wY-AK; Mon, 12 Aug 2013 09:33:08 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8oUK-0003We-B2; Mon, 12 Aug 2013 09:32:32 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8oTf-0003Qx-Uo for linux-arm-kernel@lists.infradead.org; Mon, 12 Aug 2013 09:31:53 +0000 Received: by mail-pa0-f49.google.com with SMTP id ld10so2712076pab.8 for ; Mon, 12 Aug 2013 02:31:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=Pp2zMhscRRm3sYtUF6QcaIj3Ta+ToK+DgICHoiQb4Ks=; b=gsbsltd3wy6JFSDIKMmbEpnX5zyw38GS1E78SUMjjT9ZEyImH9HQEW9zMOYzMg2gFo hZ9oscoy3DUI2F1UTibvirLztqCarHwWs7mPoc7EEihbKf87n5CaTOV5JI5IjP4N+h8Z F9kJuMhrjD7Y0ySEXCob5ncOmxtfK96ckAcSKoVlitBlRZaIX0JeadpMIVS5KKxlGxK6 XtFjmpsp4vR1AoUcmaWZUS0W8iEE1nYI/mk6sEx8rknrQdzeOoJf6fGJlcASJTzrfPj3 K+oseOkCNjDm+RX24fZFK58M8iikBSsr7e/UdmpQB8ahyGURupLVrNofYvIi3MATMkeo QvKQ== X-Gm-Message-State: ALoCoQlaDrG+DIdce70YC/SR3hHDieZkZwPyoNuJto9cSr6T2U7oD58Tyb+y+9HPPydaT0/bBgNK X-Received: by 10.68.233.134 with SMTP id tw6mr23713459pbc.9.1376299890896; Mon, 12 Aug 2013 02:31:30 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ll5sm38777586pab.19.2013.08.12.02.31.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 12 Aug 2013 02:31:30 -0700 (PDT) From: Sachin Kamat To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 8/9] clk: sunxi: Fix incorrect placement of __initconst Date: Mon, 12 Aug 2013 14:44:06 +0530 Message-Id: <1376298847-21828-8-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376298847-21828-1-git-send-email-sachin.kamat@linaro.org> References: <1376298847-21828-1-git-send-email-sachin.kamat@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130812_053152_222568_2EE2E8D6 X-CRM114-Status: GOOD ( 11.20 ) X-Spam-Score: -2.6 (--) Cc: sachin.kamat@linaro.org, =?UTF-8?q?Emilio=20L=C3=B3pez?= , mturquette@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP __initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section. Signed-off-by: Sachin Kamat Cc: Emilio López --- drivers/clk/sunxi/clk-sunxi.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 02e440b..ec2ace6 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -196,12 +196,12 @@ static struct clk_factors_config apb1_config = { .pwidth = 2, }; -static const __initconst struct factors_data pll1_data = { +static const struct factors_data pll1_data __initconst = { .table = &pll1_config, .getter = sunxi_get_pll1_factors, }; -static const __initconst struct factors_data apb1_data = { +static const struct factors_data apb1_data __initconst = { .table = &apb1_config, .getter = sunxi_get_apb1_factors, }; @@ -239,11 +239,11 @@ struct mux_data { u8 shift; }; -static const __initconst struct mux_data cpu_mux_data = { +static const struct mux_data cpu_mux_data __initconst = { .shift = 16, }; -static const __initconst struct mux_data apb1_mux_data = { +static const struct mux_data apb1_mux_data __initconst = { .shift = 24, }; @@ -284,17 +284,17 @@ struct div_data { u8 pow; }; -static const __initconst struct div_data axi_data = { +static const struct div_data axi_data __initconst = { .shift = 0, .pow = 0, }; -static const __initconst struct div_data ahb_data = { +static const struct div_data ahb_data __initconst = { .shift = 4, .pow = 1, }; -static const __initconst struct div_data apb0_data = { +static const struct div_data apb0_data __initconst = { .shift = 8, .pow = 1, }; @@ -333,31 +333,31 @@ struct gates_data { DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE); }; -static const __initconst struct gates_data sun4i_axi_gates_data = { +static const struct gates_data sun4i_axi_gates_data __initconst = { .mask = {1}, }; -static const __initconst struct gates_data sun4i_ahb_gates_data = { +static const struct gates_data sun4i_ahb_gates_data __initconst = { .mask = {0x7F77FFF, 0x14FB3F}, }; -static const __initconst struct gates_data sun5i_a13_ahb_gates_data = { +static const struct gates_data sun5i_a13_ahb_gates_data __initconst = { .mask = {0x107067e7, 0x185111}, }; -static const __initconst struct gates_data sun4i_apb0_gates_data = { +static const struct gates_data sun4i_apb0_gates_data __initconst = { .mask = {0x4EF}, }; -static const __initconst struct gates_data sun5i_a13_apb0_gates_data = { +static const struct gates_data sun5i_a13_apb0_gates_data __initconst = { .mask = {0x61}, }; -static const __initconst struct gates_data sun4i_apb1_gates_data = { +static const struct gates_data sun4i_apb1_gates_data __initconst = { .mask = {0xFF00F7}, }; -static const __initconst struct gates_data sun5i_a13_apb1_gates_data = { +static const struct gates_data sun5i_a13_apb1_gates_data __initconst = { .mask = {0xa0007}, }; @@ -411,20 +411,20 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, } /* Matches for of_clk_init */ -static const __initconst struct of_device_id clk_match[] = { +static const struct of_device_id clk_match[] __initconst = { {.compatible = "allwinner,sun4i-osc-clk", .data = sunxi_osc_clk_setup,}, {} }; /* Matches for factors clocks */ -static const __initconst struct of_device_id clk_factors_match[] = { +static const struct of_device_id clk_factors_match[] __initconst = { {.compatible = "allwinner,sun4i-pll1-clk", .data = &pll1_data,}, {.compatible = "allwinner,sun4i-apb1-clk", .data = &apb1_data,}, {} }; /* Matches for divider clocks */ -static const __initconst struct of_device_id clk_div_match[] = { +static const struct of_device_id clk_div_match[] __initconst = { {.compatible = "allwinner,sun4i-axi-clk", .data = &axi_data,}, {.compatible = "allwinner,sun4i-ahb-clk", .data = &ahb_data,}, {.compatible = "allwinner,sun4i-apb0-clk", .data = &apb0_data,}, @@ -432,14 +432,14 @@ static const __initconst struct of_device_id clk_div_match[] = { }; /* Matches for mux clocks */ -static const __initconst struct of_device_id clk_mux_match[] = { +static const struct of_device_id clk_mux_match[] __initconst = { {.compatible = "allwinner,sun4i-cpu-clk", .data = &cpu_mux_data,}, {.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &apb1_mux_data,}, {} }; /* Matches for gate clocks */ -static const __initconst struct of_device_id clk_gates_match[] = { +static const struct of_device_id clk_gates_match[] __initconst = { {.compatible = "allwinner,sun4i-axi-gates-clk", .data = &sun4i_axi_gates_data,}, {.compatible = "allwinner,sun4i-ahb-gates-clk", .data = &sun4i_ahb_gates_data,}, {.compatible = "allwinner,sun5i-a13-ahb-gates-clk", .data = &sun5i_a13_ahb_gates_data,},