From patchwork Fri Jan 6 16:31:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 9501467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2530E6021C for ; Fri, 6 Jan 2017 16:31:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10B50205AF for ; Fri, 6 Jan 2017 16:31:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 046F2284F3; Fri, 6 Jan 2017 16:31:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 890EF205AF for ; Fri, 6 Jan 2017 16:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730AbdAFQb1 (ORCPT ); Fri, 6 Jan 2017 11:31:27 -0500 Received: from mail-pf0-f176.google.com ([209.85.192.176]:34429 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752651AbdAFQb0 (ORCPT ); Fri, 6 Jan 2017 11:31:26 -0500 Received: by mail-pf0-f176.google.com with SMTP id 127so14980524pfg.1 for ; Fri, 06 Jan 2017 08:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=v8zsWYURoF/0f2pCqjMpeUpb9VL7FXAN4VcNWOBx1dw=; b=BJJTLSnNGJdSg/ARrK3zr2aBBo+ouo3/pq0l8DKaAdAC7FWe5Xed70te8suDqG10R/ jrhQuP95ETbgmBofNfiq0p7b/eHAOF5/oUAHOGv5stMQxJItrTTNeRAGcrnvtJ/iebX6 F4XfI2I3JjbNS2zUeThZNSCQeiZvYqNWR3+vs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=v8zsWYURoF/0f2pCqjMpeUpb9VL7FXAN4VcNWOBx1dw=; b=A6M1L6Ggxdaaz7qOdkyrJp8rD4n6DgNajCq3Rf+RjsBQXdCV3d11kor96A/miQKBdq XR8JeFBr6dfeVMsb8YaUpv9kQr9dcRzqxwIfPrNmjwidZ5Xy9qCMxgEOiiZh78P0Lz+2 rvsrZ0bSzy+wMdRMw7MCM97u6X2yOnYXGl8iFFwz4NOr0mz5sqIJh2gyf8l5xVSetYcP qaB/kIw0YRL3YYyLKLbfln5LPO8lZMlavYrbXHMdEX65E4x6uaCU+8Jq6+geybXh/6hT id3fbJT7ft3peW+xm8Y43oE091BgfZJIr8+x/Qg7b4nF0QyR2s77xPJjwhLblRK6T6v9 BjKQ== X-Gm-Message-State: AIkVDXKSM7VSGzZ1hDEBh1V9cRYLXxg0lIR4Z3NDcwbZanusfimfMmcf7Ia7GpCTxkBzgEu8 X-Received: by 10.99.19.65 with SMTP id 1mr84254147pgt.153.1483720286145; Fri, 06 Jan 2017 08:31:26 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id r68sm151736816pfk.85.2017.01.06.08.31.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jan 2017 08:31:24 -0800 (PST) From: Douglas Anderson To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Douglas Anderson , mturquette@baylibre.com, sboyd@codeaurora.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: rockchip: Remove useless init of "grf" to -EPROBE_DEFER Date: Fri, 6 Jan 2017 08:31:01 -0800 Message-Id: <20170106163101.32048-1-dianders@chromium.org> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we used to defer setting the "grf" member to rockchip_clk_get_grf() it was important to init the "grf" member to an error value in rockchip_clk_init(). With recent changes, we now set "grf" right in rockchip_clk_init() (two lines below the place where we initted it). That makes the old init useless. Get rid of it. Fixes: 6f339dc2719e ("clk: rockchip: lookup General Register Files in rockchip_clk_init") Signed-off-by: Douglas Anderson --- drivers/clk/rockchip/clk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index 3abcbf441cc5..fe1d393cf678 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -344,7 +344,6 @@ struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np, ctx->clk_data.clks = clk_table; ctx->clk_data.clk_num = nr_clks; ctx->cru_node = np; - ctx->grf = ERR_PTR(-EPROBE_DEFER); spin_lock_init(&ctx->lock); ctx->grf = syscon_regmap_lookup_by_phandle(ctx->cru_node,