From: Jean Pihet <j-pihet@xxxxxx>
In preparation for the generic driver implementation
Based on Paul's original code for the SmartReflex driver conversion.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
---
arch/arm/mach-omap2/smartreflex.c | 80 -------------------------------------
arch/arm/mach-omap2/smartreflex.h | 10 -----
2 files changed, 0 insertions(+), 90 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 0f03d80..947446f 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -507,86 +507,6 @@ int sr_register_class(struct smartreflex_class_data *class_data)
return 0;
}
-/**
- * omap_sr_enable() - API to enable SR clocks and to call into the
- * registered smartreflex class enable API.
- * @sr: struct smartreflex *
- *
- * This API is to be called from the kernel in order to enable
- * a particular smartreflex module. This API will do the initial
- * configurations to turn on the smartreflex module and in turn call
- * into the registered smartreflex class enable API.
- */
-void omap_sr_enable(struct smartreflex *sr)
-{
- if (IS_ERR_OR_NULL(sr))
- return;
-
- if (!sr->autocomp_active)
- return;
-
- if (!sr_class || !(sr_class->enable) || !(sr_class->configure)) {
- dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not registered\n", __func__);
- return;
- }
-
- sr_class->enable(sr);
-}
-
-/**
- * omap_sr_disable() - API to disable SR without resetting the voltage
- * processor voltage
- * @sr: struct smartreflex *
- *
- * This API is to be called from the kernel in order to disable
- * a particular smartreflex module. This API will in turn call
- * into the registered smartreflex class disable API. This API will tell
- * the smartreflex class disable not to reset the VP voltage after
- * disabling smartreflex.
- */
-void omap_sr_disable(struct smartreflex *sr)
-{
- if (IS_ERR_OR_NULL(sr))
- return;
-
- if (!sr->autocomp_active)
- return;
-
- if (!sr_class || !(sr_class->disable)) {
- dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not registered\n", __func__);
- return;
- }
-
- sr_class->disable(sr, 0);
-}
-
-/**
- * omap_sr_disable_reset_volt() - API to disable SR and reset the
- * voltage processor voltage
- * @sr: struct smartreflex *
- *
- * This API is to be called from the kernel in order to disable
- * a particular smartreflex module. This API will in turn call
- * into the registered smartreflex class disable API. This API will tell
- * the smartreflex class disable to reset the VP voltage after
- * disabling smartreflex.
- */
-void omap_sr_disable_reset_volt(struct smartreflex *sr)
-{
- if (IS_ERR_OR_NULL(sr))
- return;
-
- if (!sr->autocomp_active)
- return;
-
- if (!sr_class || !(sr_class->disable)) {
- dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not registered\n", __func__);
- return;
- }
-
- sr_class->disable(sr, 1);
-}
-
/* PM Debug Fs enteries to enable disable smartreflex. */
static int omap_sr_autocomp_show(void *data, u64 *val)
{
diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h
index 7cd7f84..5c641a8 100644
--- a/arch/arm/mach-omap2/smartreflex.h
+++ b/arch/arm/mach-omap2/smartreflex.h
@@ -245,11 +245,6 @@ struct smartreflex_platform_data {
struct smartreflex *sr;
};
-/* Smartreflex module enable/disable interface */
-void omap_sr_enable(struct smartreflex *sr);
-void omap_sr_disable(struct smartreflex *sr);
-void omap_sr_disable_reset_volt(struct smartreflex *sr);
-
/* Smartreflex driver hooks to be called from Smartreflex class driver */
int sr_enable(struct smartreflex *sr, unsigned long volt);
void sr_disable(struct smartreflex *sr);
@@ -258,10 +253,5 @@ int sr_configure_minmax(struct smartreflex *sr);
/* API to register the smartreflex class driver with the smartreflex driver */
int sr_register_class(struct smartreflex_class_data *class_data);
-#else
-static inline void omap_sr_enable(struct smartreflex *sr) {}
-static inline void omap_sr_disable(struct smartreflex *sr) {}
-static inline void omap_sr_disable_reset_volt(
- struct smartreflex *sr) {}
#endif
#endif
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
