xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: msm: Remove custom clk_set_flags() API

Browse Source 
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>
Signed-off-by: David Brown <davidb@codeaurora.org>
This commit is contained in:
Stephen Boyd
2013-06-17 10:43:14 -07:00
committed by David Brown
parent 8d21415348
commit 85a7df1f85
4 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-msm/clock-pcom.c
View File

@@ -85,15 +85,6 @@ static int pc_clk_set_max_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0; 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) static unsigned pc_clk_get_rate(unsigned id)
{ {
if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL)) 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_rate = pc_clk_set_rate,
.set_min_rate = pc_clk_set_min_rate, .set_min_rate = pc_clk_set_min_rate,
.set_max_rate = pc_clk_set_max_rate, .set_max_rate = pc_clk_set_max_rate,
.set_flags = pc_clk_set_flags,
.get_rate = pc_clk_get_rate, .get_rate = pc_clk_get_rate,
.is_enabled = pc_clk_is_enabled, .is_enabled = pc_clk_is_enabled,
.round_rate = pc_clk_round_rate, .round_rate = pc_clk_round_rate,

8
arch/arm/mach-msm/clock.c
View File

@@ -121,14 +121,6 @@ struct clk *clk_get_parent(struct clk *clk)
} }
EXPORT_SYMBOL(clk_get_parent); 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 /* 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 * 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 * make clk_min_rate handle the voting or make ebi1_clk_set_min_rate more

6
arch/arm/mach-msm/clock.h
View File

@@ -21,11 +21,6 @@
#include <linux/list.h> #include <linux/list.h>
#include <mach/clk.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 CLK_FIRST_AVAILABLE_FLAG 0x00000100
#define CLKFLAG_AUTO_OFF 0x00000200 #define CLKFLAG_AUTO_OFF 0x00000200
#define CLKFLAG_MIN 0x00000400 #define CLKFLAG_MIN 0x00000400
@@ -39,7 +34,6 @@ struct clk_ops {
int (*set_rate)(unsigned id, unsigned rate); int (*set_rate)(unsigned id, unsigned rate);
int (*set_min_rate)(unsigned id, unsigned rate); int (*set_min_rate)(unsigned id, unsigned rate);
int (*set_max_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 (*get_rate)(unsigned id);
unsigned (*is_enabled)(unsigned id); unsigned (*is_enabled)(unsigned id);
long (*round_rate)(unsigned id, unsigned rate); long (*round_rate)(unsigned id, unsigned rate);

3
arch/arm/mach-msm/include/mach/clk.h
View File

@@ -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 */ /* Assert/Deassert reset to a hardware block associated with a clock */
int clk_reset(struct clk *clk, enum clk_reset_action action); 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 #endif