[<prev] [next>] [day] [month] [year] [list]
Message-ID: <201305241627.09007.hartleys@visionengravers.com>
Date: Fri, 24 May 2013 16:27:08 -0700
From: H Hartley Sweeten <hartleys@...ionengravers.com>
To: Linux Kernel <linux-kernel@...r.kernel.org>
CC: <arnd@...db.de>, <gregkh@...uxfoundation.org>,
Ryan Mallon <rmallon@...il.com>, <mcrapet@...il.com>,
<hsweeten@...ionengravers.com>
Subject: [PATCH 11/14] misc/ep93xx_pwm: remove ep93xx_pwm_is_enabled() inline function
This is a simple wrapper around readl(), remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Ryan Mallon <rmallon@...il.com>
Cc: Matthieu Crapet <mcrapet@...il.com>
---
drivers/misc/ep93xx_pwm.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c
index 6f48375..3dd2006 100644
--- a/drivers/misc/ep93xx_pwm.c
+++ b/drivers/misc/ep93xx_pwm.c
@@ -39,11 +39,6 @@ struct ep93xx_pwm {
u32 duty_percent;
};
-static inline int ep93xx_pwm_is_enabled(struct ep93xx_pwm *pwm)
-{
- return readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1;
-}
-
static inline int ep93xx_pwm_is_inverted(struct ep93xx_pwm *pwm)
{
return readl(pwm->mmio_base + EP93XX_PWMx_INVERT) & 0x1;
@@ -84,7 +79,7 @@ static ssize_t ep93xx_pwm_get_freq(struct device *dev,
struct platform_device *pdev = to_platform_device(dev);
struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
- if (ep93xx_pwm_is_enabled(pwm)) {
+ if (readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1) {
unsigned long rate = clk_get_rate(pwm->clk);
u16 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
@@ -129,7 +124,7 @@ static ssize_t ep93xx_pwm_set_freq(struct device *dev,
writel(val, pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);
}
- if (!ep93xx_pwm_is_enabled(pwm))
+ if (!readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1)
writel(0x1, pwm->mmio_base + EP93XX_PWMx_ENABLE);
} else {
return -EINVAL;
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists