Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758156AbcLCBBr (ORCPT ); Fri, 2 Dec 2016 20:01:47 -0500 Received: from gabe.freedesktop.org ([131.252.210.177]:49166 "EHLO gabe.freedesktop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189AbcLCBBq (ORCPT ); Fri, 2 Dec 2016 20:01:46 -0500 X-Greylist: delayed 1470 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Dec 2016 20:01:46 EST From: Vinson Lee To: linux-clk@vger.kernel.org Cc: Masahiro Yamada , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] clk: uniphier: Fix build with gcc-4.4. Date: Sat, 3 Dec 2016 00:37:16 +0000 Message-Id: <1480725436-9628-1-git-send-email-vlee@freedesktop.org> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2470 Lines: 83 gcc-4.4 has issues with anonymous unions in initializers. CC drivers/clk/uniphier/clk-uniphier-sys.o drivers/clk/uniphier/clk-uniphier-sys.c:45: error: unknown field ‘factor’ specified in initializer Fixes: 1574d5722636 ("clk: uniphier: remove unneeded member name for union") Signed-off-by: Vinson Lee --- drivers/clk/uniphier/clk-uniphier-mio.c | 4 ++-- drivers/clk/uniphier/clk-uniphier.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clk/uniphier/clk-uniphier-mio.c b/drivers/clk/uniphier/clk-uniphier-mio.c index 4974d38..7441eeb 100644 --- a/drivers/clk/uniphier/clk-uniphier-mio.c +++ b/drivers/clk/uniphier/clk-uniphier-mio.c @@ -30,7 +30,7 @@ .name = "sd" #ch "-sel", \ .type = UNIPHIER_CLK_TYPE_MUX, \ .idx = -1, \ - .mux = { \ + { .mux = { \ .parent_names = { \ "sd-44m", \ "sd-33m", \ @@ -63,7 +63,7 @@ 0x00001200, \ 0x00001300, \ }, \ - }, \ + } }, \ }, \ UNIPHIER_CLK_GATE("sd" #ch, (_idx), "sd" #ch "-sel", 0x20 + 0x200 * (ch), 8) diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h index 81d7e5c..8735a7d 100644 --- a/drivers/clk/uniphier/clk-uniphier.h +++ b/drivers/clk/uniphier/clk-uniphier.h @@ -81,12 +81,12 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_CPUGEAR, \ .idx = (_idx), \ - .cpugear = { \ + { .cpugear = { \ .parent_names = { __VA_ARGS__ }, \ .num_parents = (_num_parents), \ .regbase = (_regbase), \ .mask = (_mask) \ - }, \ + } }, \ } #define UNIPHIER_CLK_FACTOR(_name, _idx, _parent, _mult, _div) \ @@ -94,11 +94,11 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_FIXED_FACTOR, \ .idx = (_idx), \ - .factor = { \ + { .factor = { \ .parent_name = (_parent), \ .mult = (_mult), \ .div = (_div), \ - }, \ + } }, \ } #define UNIPHIER_CLK_GATE(_name, _idx, _parent, _reg, _bit) \ @@ -106,11 +106,11 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_GATE, \ .idx = (_idx), \ - .gate = { \ + { .gate = { \ .parent_name = (_parent), \ .reg = (_reg), \ .bit = (_bit), \ - }, \ + } }, \ } #define UNIPHIER_CLK_DIV(parent, div) \ -- 2.7.4