aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2013-05-24 19:26:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-30 08:54:05 -0400
commit7501ba361f4b22004deec31a8227ca0240630193 (patch)
tree0e639615126483a737df7d0f2188a84a61d3a607
parentd98d7903d14781ab6a8f85daa393eddf13b7f918 (diff)
misc/ep93xx_pwm: remove ep93xx_pwm_read_tc() inline function
This is a simple wrapper around readl(), remove it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Ryan Mallon <rmallon@gmail.com> Cc: Matthieu Crapet <mcrapet@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/ep93xx_pwm.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c
index cdc2ffc08ab9..6f483753b435 100644
--- a/drivers/misc/ep93xx_pwm.c
+++ b/drivers/misc/ep93xx_pwm.c
@@ -39,11 +39,6 @@ struct ep93xx_pwm {
39 u32 duty_percent; 39 u32 duty_percent;
40}; 40};
41 41
42static inline u16 ep93xx_pwm_read_tc(struct ep93xx_pwm *pwm)
43{
44 return readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
45}
46
47static inline int ep93xx_pwm_is_enabled(struct ep93xx_pwm *pwm) 42static inline int ep93xx_pwm_is_enabled(struct ep93xx_pwm *pwm)
48{ 43{
49 return readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1; 44 return readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1;
@@ -91,7 +86,7 @@ static ssize_t ep93xx_pwm_get_freq(struct device *dev,
91 86
92 if (ep93xx_pwm_is_enabled(pwm)) { 87 if (ep93xx_pwm_is_enabled(pwm)) {
93 unsigned long rate = clk_get_rate(pwm->clk); 88 unsigned long rate = clk_get_rate(pwm->clk);
94 u16 term = ep93xx_pwm_read_tc(pwm); 89 u16 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
95 90
96 return sprintf(buf, "%ld\n", rate / (term + 1)); 91 return sprintf(buf, "%ld\n", rate / (term + 1));
97 } else { 92 } else {
@@ -122,7 +117,7 @@ static ssize_t ep93xx_pwm_set_freq(struct device *dev,
122 if (val < 1) 117 if (val < 1)
123 val = 1; 118 val = 1;
124 119
125 term = ep93xx_pwm_read_tc(pwm); 120 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
126 duty = ((val + 1) * pwm->duty_percent / 100) - 1; 121 duty = ((val + 1) * pwm->duty_percent / 100) - 1;
127 122
128 /* If pwm is running, order is important */ 123 /* If pwm is running, order is important */
@@ -165,7 +160,7 @@ static ssize_t ep93xx_pwm_set_duty_percent(struct device *dev,
165 return -EINVAL; 160 return -EINVAL;
166 161
167 if (val > 0 && val < 100) { 162 if (val > 0 && val < 100) {
168 u32 term = ep93xx_pwm_read_tc(pwm); 163 u32 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
169 u32 duty = ((term + 1) * val / 100) - 1; 164 u32 duty = ((term + 1) * val / 100) - 1;
170 165
171 writel(duty, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE); 166 writel(duty, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE);