From patchwork Wed Aug 28 01:44:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 2850509 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AC0F69F313 for ; Wed, 28 Aug 2013 02:42:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9241420353 for ; Wed, 28 Aug 2013 02:42:36 +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 180E72034D for ; Wed, 28 Aug 2013 02:42:35 +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 1VEUom-0006lM-MO; Wed, 28 Aug 2013 01:45: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 1VEUoO-00043v-Vu; Wed, 28 Aug 2013 01:44:44 +0000 Received: from mail-pa0-f53.google.com ([209.85.220.53]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEUoM-00042I-5N for linux-arm-kernel@lists.infradead.org; Wed, 28 Aug 2013 01:44:43 +0000 Received: by mail-pa0-f53.google.com with SMTP id lb1so5557107pab.26 for ; Tue, 27 Aug 2013 18:44:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:content-type:mime-version :content-transfer-encoding:to:from:in-reply-to:cc:references :message-id:user-agent:subject:date; bh=a/m1uDwCbBTMfkpFRL32+BJ1KlusfmHO3bg0TrIJmto=; b=C/ag3Xs9+Rhid3tau6eB6+KXSAGzlzrwgSA64aSrrX61WeVLVYqU23GXjK10Rnegoe S0WT4NlmVxvYTbE0acNURnp4gbdJvG+UiLT81Cd/6TdcchAuYNgLO/gnfXQnsVmiaylU VOSkkYYhfiyy08psq2FVoo2AMNMw1hJM5RWv4blLKgePu2/ivtr7tXPeXojTiS7sG5Lq ZVfUn+WaY0qWIR+bISZTGjQIHk3Etbl1x/VKoYX1RIxd7lKxvalhkQGGjWoh9zhjW/Bp p2+0oQ5YWIdR/iom8SBq0NRzNAOvBYkuudhZQfU7z2/maOdY8RLlMfzZR292j650Mac3 L1gw== X-Gm-Message-State: ALoCoQn5i/X5SmQMuFjbXa6FD3FxCkekLBOCPcwkd04A7POmQj4iTJRD3hyGIJj1VueszcFM3Ete X-Received: by 10.66.142.132 with SMTP id rw4mr24115612pab.6.1377654258435; Tue, 27 Aug 2013 18:44:18 -0700 (PDT) Received: from localhost ([2601:9:5b00:11d:ca60:ff:fe0a:8a36]) by mx.google.com with ESMTPSA id lm2sm30108159pab.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 27 Aug 2013 18:44:17 -0700 (PDT) MIME-Version: 1.0 To: Sachin Kamat , linux-arm-kernel@lists.infradead.org From: Mike Turquette In-Reply-To: <1376298847-21828-8-git-send-email-sachin.kamat@linaro.org> References: <1376298847-21828-1-git-send-email-sachin.kamat@linaro.org> <1376298847-21828-8-git-send-email-sachin.kamat@linaro.org> Message-ID: <20130828014412.8231.96003@quantum> User-Agent: alot/0.3.4 Subject: Re: [PATCH 8/9] clk: sunxi: Fix incorrect placement of __initconst Date: Tue, 27 Aug 2013 18:44:12 -0700 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130827_214442_387009_F983EEF1 X-CRM114-Status: GOOD ( 14.71 ) X-Spam-Score: -2.6 (--) Cc: sachin.kamat@linaro.org, =?utf-8?q?Emilio_L=C3=B3pez?= 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=-6.7 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 Quoting Sachin Kamat (2013-08-12 02:14:06) > __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 Thanks much for this cleanup! I've applied all of the patches in this series. This patch required reflow due to recent changes to the sunxi clock driver. Below is what I merged. Let me know if there are any issues. Regards, Mike From 52be7cc862942ea0a53031b3b1ca84dc95422b5b Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 12 Aug 2013 14:44:06 +0530 Subject: [PATCH] clk: sunxi: Fix incorrect placement of __initconst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __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 Signed-off-by: Mike Turquette [mturquette@linaro.org: refreshed patch based on sunxi changes] --- drivers/clk/sunxi/clk-sunxi.c | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index d39f213..34ee69f 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -288,17 +288,17 @@ static struct clk_factors_config sun4i_apb1_config = { .pwidth = 2, }; -static const __initconst struct factors_data sun4i_pll1_data = { +static const struct factors_data sun4i_pll1_data __initconst = { .table = &sun4i_pll1_config, .getter = sun4i_get_pll1_factors, }; -static const __initconst struct factors_data sun6i_a31_pll1_data = { +static const struct factors_data sun6i_a31_pll1_data __initconst = { .table = &sun6i_a31_pll1_config, .getter = sun6i_a31_get_pll1_factors, }; -static const __initconst struct factors_data sun4i_apb1_data = { +static const struct factors_data sun4i_apb1_data __initconst = { .table = &sun4i_apb1_config, .getter = sun4i_get_apb1_factors, }; @@ -336,15 +336,15 @@ struct mux_data { u8 shift; }; -static const __initconst struct mux_data sun4i_cpu_mux_data = { +static const struct mux_data sun4i_cpu_mux_data __initconst = { .shift = 16, }; -static const __initconst struct mux_data sun6i_a31_ahb1_mux_data = { +static const struct mux_data sun6i_a31_ahb1_mux_data __initconst = { .shift = 12, }; -static const __initconst struct mux_data sun4i_apb1_mux_data = { +static const struct mux_data sun4i_apb1_mux_data __initconst = { .shift = 24, }; @@ -385,25 +385,25 @@ struct div_data { u8 width; }; -static const __initconst struct div_data sun4i_axi_data = { +static const struct div_data sun4i_axi_data __initconst = { .shift = 0, .pow = 0, .width = 2, }; -static const __initconst struct div_data sun4i_ahb_data = { +static const struct div_data sun4i_ahb_data __initconst = { .shift = 4, .pow = 1, .width = 2, }; -static const __initconst struct div_data sun4i_apb0_data = { +static const struct div_data sun4i_apb0_data __initconst = { .shift = 8, .pow = 1, .width = 2, }; -static const __initconst struct div_data sun6i_a31_apb2_div_data = { +static const struct div_data sun6i_a31_apb2_div_data __initconst = { .shift = 0, .pow = 0, .width = 4, @@ -443,67 +443,67 @@ 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_a10s_ahb_gates_data = { +static const struct gates_data sun5i_a10s_ahb_gates_data __initconst = { .mask = {0x147667e7, 0x185915}, }; -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 sun6i_a31_ahb1_gates_data = { +static const struct gates_data sun6i_a31_ahb1_gates_data __initconst = { .mask = {0xEDFE7F62, 0x794F931}, }; -static const __initconst struct gates_data sun7i_a20_ahb_gates_data = { +static const struct gates_data sun7i_a20_ahb_gates_data __initconst = { .mask = { 0x12f77fff, 0x16ff3f }, }; -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_a10s_apb0_gates_data = { +static const struct gates_data sun5i_a10s_apb0_gates_data __initconst = { .mask = {0x469}, }; -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 sun7i_a20_apb0_gates_data = { +static const struct gates_data sun7i_a20_apb0_gates_data __initconst = { .mask = { 0x4ff }, }; -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_a10s_apb1_gates_data = { +static const struct gates_data sun5i_a10s_apb1_gates_data __initconst = { .mask = {0xf0007}, }; -static const __initconst struct gates_data sun5i_a13_apb1_gates_data = { +static const struct gates_data sun5i_a13_apb1_gates_data __initconst = { .mask = {0xa0007}, }; -static const __initconst struct gates_data sun6i_a31_apb1_gates_data = { +static const struct gates_data sun6i_a31_apb1_gates_data __initconst = { .mask = {0x3031}, }; -static const __initconst struct gates_data sun6i_a31_apb2_gates_data = { +static const struct gates_data sun6i_a31_apb2_gates_data __initconst = { .mask = {0x3F000F}, }; -static const __initconst struct gates_data sun7i_a20_apb1_gates_data = { +static const struct gates_data sun7i_a20_apb1_gates_data __initconst = { .mask = { 0xff80ff }, }; @@ -557,7 +557,7 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, } /* 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 = &sun4i_pll1_data,}, {.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,}, {.compatible = "allwinner,sun4i-apb1-clk", .data = &sun4i_apb1_data,}, @@ -565,7 +565,7 @@ static const __initconst struct of_device_id clk_factors_match[] = { }; /* 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 = &sun4i_axi_data,}, {.compatible = "allwinner,sun4i-ahb-clk", .data = &sun4i_ahb_data,}, {.compatible = "allwinner,sun4i-apb0-clk", .data = &sun4i_apb0_data,}, @@ -574,7 +574,7 @@ 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 = &sun4i_cpu_mux_data,}, {.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &sun4i_apb1_mux_data,}, {.compatible = "allwinner,sun6i-a31-ahb1-mux-clk", .data = &sun6i_a31_ahb1_mux_data,}, @@ -582,7 +582,7 @@ static const __initconst struct of_device_id clk_mux_match[] = { }; /* 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-a10s-ahb-gates-clk", .data = &sun5i_a10s_ahb_gates_data,},