From: Stephen Boyd <sboyd@codeaurora.org>
To: David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH/RESEND 07/12] ARM: msm: Remove custom clk_set_flags() API
Date: Mon, 17 Jun 2013 10:43:14 -0700 [thread overview]
Message-ID: <1371490999-15501-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1371490999-15501-1-git-send-email-sboyd@codeaurora.org>
Nobody is using this API upstream and it's just contributing
cruft. Remove it so the MSM clock API is closer to the generic
struct clock API.
Acked-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/mach-msm/clock-pcom.c | 10 ----------
arch/arm/mach-msm/clock.c | 8 --------
arch/arm/mach-msm/clock.h | 6 ------
arch/arm/mach-msm/include/mach/clk.h | 3 ---
4 files changed, 27 deletions(-)
diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c
index a52c970..bb75f8e 100644
--- a/arch/arm/mach-msm/clock-pcom.c
+++ b/arch/arm/mach-msm/clock-pcom.c
@@ -85,15 +85,6 @@ static int pc_clk_set_max_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0;
}
-static int pc_clk_set_flags(unsigned id, unsigned flags)
-{
- int rc = msm_proc_comm(PCOM_CLKCTL_RPC_SET_FLAGS, &id, &flags);
- if (rc < 0)
- return rc;
- else
- return (int)id < 0 ? -EINVAL : 0;
-}
-
static unsigned pc_clk_get_rate(unsigned id)
{
if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL))
@@ -130,7 +121,6 @@ struct clk_ops clk_ops_pcom = {
.set_rate = pc_clk_set_rate,
.set_min_rate = pc_clk_set_min_rate,
.set_max_rate = pc_clk_set_max_rate,
- .set_flags = pc_clk_set_flags,
.get_rate = pc_clk_get_rate,
.is_enabled = pc_clk_is_enabled,
.round_rate = pc_clk_round_rate,
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index d9145df..5fac2df 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -121,14 +121,6 @@ struct clk *clk_get_parent(struct clk *clk)
}
EXPORT_SYMBOL(clk_get_parent);
-int clk_set_flags(struct clk *clk, unsigned long flags)
-{
- if (clk == NULL || IS_ERR(clk))
- return -EINVAL;
- return clk->ops->set_flags(clk->id, flags);
-}
-EXPORT_SYMBOL(clk_set_flags);
-
/* EBI1 is the only shared clock that several clients want to vote on as of
* this commit. If this changes in the future, then it might be better to
* make clk_min_rate handle the voting or make ebi1_clk_set_min_rate more
diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
index 2c007f6..a25ff58 100644
--- a/arch/arm/mach-msm/clock.h
+++ b/arch/arm/mach-msm/clock.h
@@ -21,11 +21,6 @@
#include <linux/list.h>
#include <mach/clk.h>
-#define CLKFLAG_INVERT 0x00000001
-#define CLKFLAG_NOINVERT 0x00000002
-#define CLKFLAG_NONEST 0x00000004
-#define CLKFLAG_NORESET 0x00000008
-
#define CLK_FIRST_AVAILABLE_FLAG 0x00000100
#define CLKFLAG_AUTO_OFF 0x00000200
#define CLKFLAG_MIN 0x00000400
@@ -39,7 +34,6 @@ struct clk_ops {
int (*set_rate)(unsigned id, unsigned rate);
int (*set_min_rate)(unsigned id, unsigned rate);
int (*set_max_rate)(unsigned id, unsigned rate);
- int (*set_flags)(unsigned id, unsigned flags);
unsigned (*get_rate)(unsigned id);
unsigned (*is_enabled)(unsigned id);
long (*round_rate)(unsigned id, unsigned rate);
diff --git a/arch/arm/mach-msm/include/mach/clk.h b/arch/arm/mach-msm/include/mach/clk.h
index e8d3842..5f1c37d 100644
--- a/arch/arm/mach-msm/include/mach/clk.h
+++ b/arch/arm/mach-msm/include/mach/clk.h
@@ -34,7 +34,4 @@ int clk_set_max_rate(struct clk *clk, unsigned long rate);
/* Assert/Deassert reset to a hardware block associated with a clock */
int clk_reset(struct clk *clk, enum clk_reset_action action);
-/* Set clock-specific configuration parameters */
-int clk_set_flags(struct clk *clk, unsigned long flags);
-
#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-17 17:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 17:43 [PATCH/RESEND 00/12] Convert MSM to common clock framework Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 01/12] msm_serial: Convert to clk_prepare/unprepare Stephen Boyd
2013-06-17 17:55 ` Greg Kroah-Hartman
2013-06-17 18:07 ` David Brown
2013-06-17 18:27 ` Greg Kroah-Hartman
2013-06-17 17:43 ` [PATCH/RESEND 02/12] msm_serial: Use devm_clk_get() and properly return errors Stephen Boyd
2013-06-17 17:55 ` Greg Kroah-Hartman
2013-06-17 17:43 ` [PATCH/RESEND 03/12] usb: otg: msm: Convert to clk_prepare/unprepare Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 04/12] msm_sdcc: " Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 05/12] msm: iommu: " Stephen Boyd
2013-06-20 16:40 ` Stephen Boyd
2013-06-20 17:04 ` Joerg Roedel
2013-06-17 17:43 ` [PATCH/RESEND 06/12] msm: iommu: Use clk_set_rate() instead of clk_set_min_rate() Stephen Boyd
2013-06-20 16:41 ` Stephen Boyd
2013-06-20 17:04 ` Joerg Roedel
2013-06-17 17:43 ` Stephen Boyd [this message]
2013-06-17 17:43 ` [PATCH/RESEND 08/12] ARM: msm: Remove custom clk_set_{max,min}_rate() API Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 09/12] ARM: msm: Remove clock-7x30.h include file Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 10/12] ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 11/12] ARM: msm: Make proc_comm clock control into a platform driver Stephen Boyd
2013-06-19 16:34 ` Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 12/12] ARM: msm: Migrate to common clock framework Stephen Boyd
2013-06-21 1:29 ` [PATCH/RESEND 00/12] Convert MSM " Stephen Boyd
2013-06-24 20:10 ` David Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371490999-15501-8-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).