1 files changed, 1 insertions, 89 deletions

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index b2dd88b48420..901576eb5a84 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -30,7 +30,6 @@
 #include <linux/gpio.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
-#include <linux/regulator/consumer.h>
 #include <linux/mutex.h>
 
 #include <video/omapdss.h>
@@ -55,73 +54,6 @@ static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable);
 
 static int taal_panel_reset(struct omap_dss_device *dssdev);
 
-struct panel_regulator {
-        struct regulator *regulator;
-        const char *name;
-        int min_uV;
-        int max_uV;
-};
-
-static void free_regulators(struct panel_regulator *regulators, int n)
-{
-        int i;
-
-        for (i = 0; i < n; i++) {
-                /* disable/put in reverse order */
-                regulator_disable(regulators[n - i - 1].regulator);
-                regulator_put(regulators[n - i - 1].regulator);
-        }
-}
-
-static int init_regulators(struct omap_dss_device *dssdev,
-                        struct panel_regulator *regulators, int n)
-{
-        int r, i, v;
-
-        for (i = 0; i < n; i++) {
-                struct regulator *reg;
-
-                reg = regulator_get(&dssdev->dev, regulators[i].name);
-                if (IS_ERR(reg)) {
-                        dev_err(&dssdev->dev, "failed to get regulator %s\n",
-                                regulators[i].name);
-                        r = PTR_ERR(reg);
-                        goto err;
-                }
-
-                /* FIXME: better handling of fixed vs. variable regulators */
-                v = regulator_get_voltage(reg);
-                if (v < regulators[i].min_uV || v > regulators[i].max_uV) {
-                        r = regulator_set_voltage(reg, regulators[i].min_uV,
-                                                regulators[i].max_uV);
-                        if (r) {
-                                dev_err(&dssdev->dev,
-                                        "failed to set regulator %s voltage\n",
-                                        regulators[i].name);
-                                regulator_put(reg);
-                                goto err;
-                        }
-                }
-
-                r = regulator_enable(reg);
-                if (r) {
-                        dev_err(&dssdev->dev, "failed to enable regulator %s\n",
-                                regulators[i].name);
-                        regulator_put(reg);
-                        goto err;
-                }
-
-                regulators[i].regulator = reg;
-        }
-
-        return 0;
-
-err:
-        free_regulators(regulators, i);
-
-        return r;
-}
-
 /**
  * struct panel_config - panel configuration
  * @name: panel name
@@ -150,8 +82,6 @@ struct panel_config {
                 unsigned int low;
         } reset_sequence;
 
-        struct panel_regulator *regulators;
-        int num_regulators;
 };
 
 enum {
@@ -577,12 +507,6 @@ static const struct backlight_ops taal_bl_ops = {
         .update_status  = taal_bl_update_status,
 };
 
-static void taal_get_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static void taal_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres)
 {
@@ -602,7 +526,7 @@ static ssize_t taal_num_errors_show(struct device *dev,
 {
         struct omap_dss_device *dssdev = to_dss_device(dev);
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        u8 errors;
+        u8 errors = 0;
         int r;
 
         mutex_lock(&td->lock);
@@ -977,11 +901,6 @@ static int taal_probe(struct omap_dss_device *dssdev)
 
         atomic_set(&td->do_update, 0);
 
-        r = init_regulators(dssdev, panel_config->regulators,
-                        panel_config->num_regulators);
-        if (r)
-                goto err_reg;
-
         td->workqueue = create_singlethread_workqueue("taal_esd");
         if (td->workqueue == NULL) {
                 dev_err(&dssdev->dev, "can't create ESD workqueue\n");
@@ -1087,8 +1006,6 @@ err_bl:
 err_rst_gpio:
         destroy_workqueue(td->workqueue);
 err_wq:
-        free_regulators(panel_config->regulators, panel_config->num_regulators);
-err_reg:
         kfree(td);
 err:
         return r;
@@ -1125,9 +1042,6 @@ static void __exit taal_remove(struct omap_dss_device *dssdev)
         /* reset, to be sure that the panel is in a valid state */
         taal_hw_reset(dssdev);
 
-        free_regulators(td->panel_config->regulators,
-                        td->panel_config->num_regulators);
-
         if (gpio_is_valid(panel_data->reset_gpio))
                 gpio_free(panel_data->reset_gpio);
 
@@ -1909,8 +1823,6 @@ static struct omap_dss_driver taal_driver = {
         .run_test       = taal_run_test,
         .memory_read    = taal_memory_read,
 
-        .get_timings    = taal_get_timings,
-
         .driver         = {
                 .name   = "taal",
                 .owner  = THIS_MODULE,