staging: omap-thermal: improve conf data handling and initialization

While registering the thermal zone, it is required to have the cooling
devices already setup, so that the .bind callback can succeed.

Due to that, the driver code needs to be reorganized so that we first
setup the cooling devices then the zones. This way we cope with the
right thermal framework initialization sequence.

This patch changes the order of the thermal zone initialization,
so that we create it only when the cooling devices are available.
It also adds some defensive checks for the config data, so that
the callbacks are ready for calls when the data is still not
initialized.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c
index 9ef44eab468a3daddca2a8165b0ffc686c840f7c..ff93c15d349bba2e23466c9da30daca34565797a 100644 (file)
--- a/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/drivers/staging/omap-thermal/omap-bandgap.c
@@ -953,12 +953,12 @@ int __devinit omap_bandgap_probe(struct platform_device *pdev)
        for (i = 0; i < bg_ptr->conf->sensor_count; i++) {
                char *domain;
 
+               if (bg_ptr->conf->sensors[i].register_cooling)
+                       bg_ptr->conf->sensors[i].register_cooling(bg_ptr, i);
+
                domain = bg_ptr->conf->sensors[i].domain;
                if (bg_ptr->conf->expose_sensor)
                        bg_ptr->conf->expose_sensor(bg_ptr, i, domain);
-
-               if (bg_ptr->conf->sensors[i].register_cooling)
-                       bg_ptr->conf->sensors[i].register_cooling(bg_ptr, i);
        }
 
        /*

diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/omap-thermal/omap-thermal-common.c
index d156424870083e88935afe3f1b52559c6aa147f0..46ee0a9f49d92dfb43344b95856e53adf3462dd6 100644 (file)
--- a/drivers/staging/omap-thermal/omap-thermal-common.c
+++ b/drivers/staging/omap-thermal/omap-thermal-common.c
@@ -77,10 +77,16 @@ static inline int omap_thermal_get_temp(struct thermal_zone_device *thermal,
                                         unsigned long *temp)
 {
        struct omap_thermal_data *data = thermal->devdata;
-       struct omap_bandgap *bg_ptr = data->bg_ptr;
-       struct omap_temp_sensor *s = &bg_ptr->conf->sensors[data->sensor_id];
+       struct omap_bandgap *bg_ptr;
+       struct omap_temp_sensor *s;
        int ret, tmp, pcb_temp, slope, constant;
 
+       if (!data)
+               return 0;
+
+       bg_ptr = data->bg_ptr;
+       s = &bg_ptr->conf->sensors[data->sensor_id];
+
        ret = omap_bandgap_read_temperature(bg_ptr, data->sensor_id, &tmp);
        if (ret)
                return ret;
@@ -227,21 +233,37 @@ static struct thermal_zone_device_ops omap_thermal_ops = {
        .get_crit_temp = omap_thermal_get_crit_temp,
 };
 
-int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
-                              char *domain)
+static struct omap_thermal_data
+*omap_thermal_build_data(struct omap_bandgap *bg_ptr, int id)
 {
        struct omap_thermal_data *data;
 
        data = devm_kzalloc(bg_ptr->dev, sizeof(*data), GFP_KERNEL);
        if (!data) {
                dev_err(bg_ptr->dev, "kzalloc fail\n");
-               return -ENOMEM;
+               return NULL;
        }
        data->sensor_id = id;
        data->bg_ptr = bg_ptr;
        data->mode = THERMAL_DEVICE_ENABLED;
        INIT_WORK(&data->thermal_wq, omap_thermal_work);
 
+       return data;
+}
+
+int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
+                              char *domain)
+{
+       struct omap_thermal_pdata pdata;
+
+       data = omap_bandgap_get_sensor_data(bg_ptr, id);
+
+       if (!data)
+               data = omap_thermal_build_pdata(bg_ptr, id);
+
+       if (!data)
+               return -EINVAL;
+
        /* TODO: remove TC1 TC2 */
        /* Create thermal zone */
        data->omap_thermal = thermal_zone_device_register(domain,
@@ -335,6 +357,11 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id)
        int tab_size, ret;
 
        data = omap_bandgap_get_sensor_data(bg_ptr, id);
+       if (!data)
+               data = omap_thermal_build_pdata(bg_ptr, id);
+
+       if (!data)
+               return -EINVAL;
 
        ret = omap_thermal_build_cpufreq_clip(bg_ptr, &tab_ptr, &tab_size);
        if (ret < 0) {
@@ -351,6 +378,7 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id)
                return PTR_ERR(data->cool_dev);
        }
        bg_ptr->conf->sensors[id].cooling_data.freq_clip_count = tab_size;
+       omap_bandgap_set_sensor_data(bg_ptr, id, data);
 
        return 0;
 }