From patchwork Tue Jan 26 12:45:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 370627 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp4960692jam; Tue, 26 Jan 2021 05:09:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyteEHks9HwNbWXqoHUZ8ahK8GZZmAC38DOVoRLTWGPYKFyvPi1eKRKiAqiN5RA4iA83C6S X-Received: by 2002:a05:6402:1f4:: with SMTP id i20mr4388740edy.180.1611666566886; Tue, 26 Jan 2021 05:09:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611666566; cv=none; d=google.com; s=arc-20160816; b=WaNbJHADzUhx9V/1bXCBAx4wsqntygzdaWDcvNnFk8rqtqlXSjfVFcmFiMLT17iwYd XDy3oCzJX2WpFLQmmMwxaYHVpSVM4Lr2sgt7xtQXoyyp9W0EYNe7agDzzcx4whQQNfsN HtlRGk8EsCPBrgmusfBeZP3N44a9f0Tc/ZYJcWRmdBYGrxnkmUUbrEbbWxcw23pIQo+K C2UER9D73JRpITMUX+cFwVpZeWnDwwGgP5V2olDQn6EqPqnGcLE5yzB1BNVERfn8K2AL aTOTTcxOeYQhYb/+mBkvrojm91jva6Izrc3HzSiRqOLIMBnHj46BRcbZuViqvXWBbcT/ nCew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ACuhHqUyAOgeit1pJS1MxY6/38vCSWpT3UKaTx8+/JY=; b=rnKpWUAzkn1yGJgFR6pyhVD05T0B3J4q9LFHo3eoyHs4peEh8kXUjPqOyE3Lvk3Ihi rDtxcZZG5FsLtNoC55+XucnHlNwNoM0OOhH9YqNwHY6eDm8PzuJfOZVOWfDm0t5jef4S NqJLy2/xqeeFgU6rGoJDFKuAhEby9I4C64cemlfQd3lgHJ9M2+wr+7ZrpQGw0pPG3h9G x6alTMxHV/xmVOxRuVncK1zCCkN5pflr9KWLM8Sz8K2j/Z1hOKZgtn+slM7q5k9gCQa0 Jwg+p8z62BAYMpxu744fqrMN5m6ptI3zi+QowMXqQ7k3LWro2krrt5rK0fRL4JEbH/Ov 1P6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fM8B1mFx; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce16si8877914edb.87.2021.01.26.05.09.26; Tue, 26 Jan 2021 05:09:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fM8B1mFx; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392325AbhAZNIW (ORCPT + 15 others); Tue, 26 Jan 2021 08:08:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391968AbhAZMsz (ORCPT ); Tue, 26 Jan 2021 07:48:55 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46103C035430 for ; Tue, 26 Jan 2021 04:46:07 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id e15so2665476wme.0 for ; Tue, 26 Jan 2021 04:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ACuhHqUyAOgeit1pJS1MxY6/38vCSWpT3UKaTx8+/JY=; b=fM8B1mFx2eVpjNGE3vhWFZC0WnRAysxKHxe+DAlNp0M68o88FbxPu79MK7N6KiE2w6 9Xz6u4qdahy0LI9WhaFK/lyoXeoeyTIRv3jDEuQ+1axa99t2wwYOv3R4ZYP7Nf33NHcF h/ifupziL/bRk8bMH6nIbZRqrxAaPuu8HhFAWxW4P1w0jDAp4QjTtN/sMy8BVDVsBKeJ 5XqZMH2ZHCMbswWDflwfuj2IwwEkK5sK41ABrUURUYOQM0CqIeNKuZ/QR+TlG/5OyQY4 UAK2fLKyhInTzveMOSTFN0HX58oaY6FSzzY0nRCsLMpkwG8QaNeop7L+F9Ub+d7NkC/G +g1Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ACuhHqUyAOgeit1pJS1MxY6/38vCSWpT3UKaTx8+/JY=; b=WSpXKSMS3Z2vYtLyKisG+0gTtv8k75ONwir0eJdFkmWtm9mwS78BHZnu/cE98teA7r w+0LkhaZvnY1QndFVDK7y/OczMhZI5UfeGCBp5NWqnRejDYWLpdDLSIwBX9YZHkS9PfQ +5FnJebcHE2+30VlZYSK+iAHDdzk6rYOr7VdlCClu0Fiw8/+ORyS3f5ggIcZNuu6v5Tz p10MCOkmTcd5IcZOjvoekQaZlr60F17aCSUs14/RrvDDaTeDe1yf5e3TdbnygmKE/D0F 1o22/RVpT/+5bE2t3/xmMZRTIgCmxPYdGj9MgLMJtfkQyKNYTe/KnBZPr/GWLFto3U+D ng8A== X-Gm-Message-State: AOAM533T6jVgDNvspnyKOWtXvqu/4gkF/3g53nZ7kq+VSVUGDdtyTbkZ 8101cWTSeP8V4xQpoU9eL7zV1Q== X-Received: by 2002:a1c:f706:: with SMTP id v6mr4569286wmh.85.1611665166044; Tue, 26 Jan 2021 04:46:06 -0800 (PST) Received: from dell.default ([91.110.221.188]) by smtp.gmail.com with ESMTPSA id i131sm3263073wmi.25.2021.01.26.04.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 04:46:05 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH 18/21] clk: qcom: clk-rpm: Remove a bunch of superfluous code Date: Tue, 26 Jan 2021 12:45:37 +0000 Message-Id: <20210126124540.3320214-19-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210126124540.3320214-1-lee.jones@linaro.org> References: <20210126124540.3320214-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/clk/qcom/clk-rpm.c:453:29: warning: ‘clk_rpm_branch_ops’ defined but not used [-Wunused-const-variable=] Cc: Andy Gross Cc: Bjorn Andersson Cc: Michael Turquette Cc: Stephen Boyd Cc: linux-arm-msm@vger.kernel.org Cc: linux-clk@vger.kernel.org Signed-off-by: Lee Jones --- drivers/clk/qcom/clk-rpm.c | 63 -------------------------------------- 1 file changed, 63 deletions(-) -- 2.25.1 Reviewed-by: Bjorn Andersson diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c index f71d228fd6bd5..a18811c380187 100644 --- a/drivers/clk/qcom/clk-rpm.c +++ b/drivers/clk/qcom/clk-rpm.c @@ -73,62 +73,6 @@ }, \ } -#define DEFINE_CLK_RPM_PXO_BRANCH(_platform, _name, _active, r_id, r) \ - static struct clk_rpm _platform##_##_active; \ - static struct clk_rpm _platform##_##_name = { \ - .rpm_clk_id = (r_id), \ - .active_only = true, \ - .peer = &_platform##_##_active, \ - .rate = (r), \ - .branch = true, \ - .hw.init = &(struct clk_init_data){ \ - .ops = &clk_rpm_branch_ops, \ - .name = #_name, \ - .parent_names = (const char *[]){ "pxo_board" }, \ - .num_parents = 1, \ - }, \ - }; \ - static struct clk_rpm _platform##_##_active = { \ - .rpm_clk_id = (r_id), \ - .peer = &_platform##_##_name, \ - .rate = (r), \ - .branch = true, \ - .hw.init = &(struct clk_init_data){ \ - .ops = &clk_rpm_branch_ops, \ - .name = #_active, \ - .parent_names = (const char *[]){ "pxo_board" }, \ - .num_parents = 1, \ - }, \ - } - -#define DEFINE_CLK_RPM_CXO_BRANCH(_platform, _name, _active, r_id, r) \ - static struct clk_rpm _platform##_##_active; \ - static struct clk_rpm _platform##_##_name = { \ - .rpm_clk_id = (r_id), \ - .peer = &_platform##_##_active, \ - .rate = (r), \ - .branch = true, \ - .hw.init = &(struct clk_init_data){ \ - .ops = &clk_rpm_branch_ops, \ - .name = #_name, \ - .parent_names = (const char *[]){ "cxo_board" }, \ - .num_parents = 1, \ - }, \ - }; \ - static struct clk_rpm _platform##_##_active = { \ - .rpm_clk_id = (r_id), \ - .active_only = true, \ - .peer = &_platform##_##_name, \ - .rate = (r), \ - .branch = true, \ - .hw.init = &(struct clk_init_data){ \ - .ops = &clk_rpm_branch_ops, \ - .name = #_active, \ - .parent_names = (const char *[]){ "cxo_board" }, \ - .num_parents = 1, \ - }, \ - } - #define to_clk_rpm(_hw) container_of(_hw, struct clk_rpm, hw) struct rpm_cc; @@ -450,13 +394,6 @@ static const struct clk_ops clk_rpm_ops = { .recalc_rate = clk_rpm_recalc_rate, }; -static const struct clk_ops clk_rpm_branch_ops = { - .prepare = clk_rpm_prepare, - .unprepare = clk_rpm_unprepare, - .round_rate = clk_rpm_round_rate, - .recalc_rate = clk_rpm_recalc_rate, -}; - /* MSM8660/APQ8060 */ DEFINE_CLK_RPM(msm8660, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK); DEFINE_CLK_RPM(msm8660, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);