Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: rcar_gen3_thermal: store device match data in private structure

Browse Source 
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+renesas@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Niklas Söderlund 2017-03-29 20:43:55 +02:00 committed by Eduardo Valentin
parent 7d4b269776
commit cc4d072b66
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/thermal/rcar_gen3_thermal.c
View File

@ -88,6 +88,7 @@ struct rcar_gen3_thermal_priv {
struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM]; struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM];
unsigned int num_tscs; unsigned int num_tscs;
spinlock_t lock; /* Protect interrupts on and off */ spinlock_t lock; /* Protect interrupts on and off */
const struct rcar_gen3_thermal_data *data;
}; };
struct rcar_gen3_thermal_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; struct thermal_zone_device *zone;
int ret, irq, i; int ret, irq, i;
char *irqname; char *irqname;
const struct rcar_gen3_thermal_data *match_data =
of_device_get_match_data(dev);
/* default values if FUSEs are missing */ /* default values if FUSEs are missing */
/* TODO: Read values from hardware on supported platforms */ /* TODO: Read values from hardware on supported platforms */
@ -367,6 +366,8 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->data = of_device_get_match_data(dev);
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
@ -417,7 +418,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
priv->tscs[i] = tsc; priv->tscs[i] = tsc;
match_data->thermal_init(tsc); priv->data->thermal_init(tsc);
rcar_gen3_thermal_calc_coefs(&tsc->coef, ptat, thcode[i]); rcar_gen3_thermal_calc_coefs(&tsc->coef, ptat, thcode[i]);
zone = devm_thermal_zone_of_sensor_register(dev, i, tsc, zone = devm_thermal_zone_of_sensor_register(dev, i, tsc,