[PATCH v3 6/7] thermal: rcar_gen3_thermal: store device match data in private structure

[Niklas Söderlund]

The device match data needs to be accessible outside the probe function,
store it in the private data structure.

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be>
Reviewed-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
---
 drivers/thermal/rcar_gen3_thermal.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/thermal/rcar_gen3_thermal.c 
b/drivers/thermal/rcar_gen3_thermal.c
index d37c7d8f8fcd6619..f259a995c66c976a 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -88,6 +88,7 @@ struct rcar_gen3_thermal_priv {
        struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM];
        unsigned int num_tscs;
        spinlock_t lock; /* Protect interrupts on and off */
+       const struct rcar_gen3_thermal_data *data;
 };
 
 struct rcar_gen3_thermal_data {
@@ -351,8 +352,6 @@ static int rcar_gen3_thermal_probe(struct platform_device 
*pdev)
        struct thermal_zone_device *zone;
        int ret, irq, i;
        char *irqname;
-       const struct rcar_gen3_thermal_data *match_data =
-               of_device_get_match_data(dev);
 
        /* default values if FUSEs are missing */
        /* TODO: Read values from hardware on supported platforms */
@@ -367,6 +366,8 @@ static int rcar_gen3_thermal_probe(struct platform_device 
*pdev)
        if (!priv)
                return -ENOMEM;
 
+       priv->data = of_device_get_match_data(dev);
+
        spin_lock_init(&priv->lock);
 
        platform_set_drvdata(pdev, priv);
@@ -417,7 +418,7 @@ static int rcar_gen3_thermal_probe(struct platform_device 
*pdev)
 
                priv->tscs[i] = tsc;
 
-               match_data->thermal_init(tsc);
+               priv->data->thermal_init(tsc);
                rcar_gen3_thermal_calc_coefs(&tsc->coef, ptat, thcode[i]);
 
                zone = devm_thermal_zone_of_sensor_register(dev, i, tsc,
-- 
2.12.1