Messages in this thread | | | Date | Mon, 14 Mar 2016 14:16:08 -0700 | From | Eduardo Valentin <> | Subject | Re: [PATCH 12/13] thermal: convert tegra_thermal to use devm_thermal_zone_of_sensor_register |
| |
On Thu, Mar 10, 2016 at 04:46:55PM +0800, Wei Ni wrote: > > > On 2016年03月10日 05:35, Eduardo Valentin wrote: > > This changes the driver to use the devm_ version > > of thermal_zone_of_sensor_register and cleans > > up the local points and unregister calls. > > > > Cc: Zhang Rui <rui.zhang@intel.com> > > Cc: Stephen Warren <swarren@wwwdotorg.org> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > Cc: Alexandre Courbot <gnurou@gmail.com> > > Cc: linux-pm@vger.kernel.org > > Cc: linux-tegra@vger.kernel.org > > Cc: linux-kernel@vger.kernel.org > > Signed-off-by: Eduardo Valentin <edubezval@gmail.com> > > --- > > drivers/thermal/tegra_soctherm.c | 31 +++++++++---------------------- > > 1 file changed, 9 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/thermal/tegra_soctherm.c b/drivers/thermal/tegra_soctherm.c > > index 74ea576..0018ccd 100644 > > --- a/drivers/thermal/tegra_soctherm.c > > +++ b/drivers/thermal/tegra_soctherm.c > > @@ -168,7 +168,7 @@ struct tegra_soctherm { > > struct clk *clock_soctherm; > > void __iomem *regs; > > > > - struct thermal_zone_device *thermctl_tzs[4]; > > +#define ZONE_NUMBER 4 > > }; > > > > struct tsensor_shared_calibration { > > @@ -342,7 +342,7 @@ static const struct thermctl_zone_desc t124_thermctl_temp_zones[] = { > > static int tegra_soctherm_probe(struct platform_device *pdev) > > { > > struct tegra_soctherm *tegra; > > - struct thermal_zone_device *tz; > > + struct thermal_zone_device *z; > > struct tsensor_shared_calibration shared_calib; > > struct resource *res; > > unsigned int i; > > @@ -408,36 +408,29 @@ static int tegra_soctherm_probe(struct platform_device *pdev) > > > > /* Initialize thermctl sensors */ > > > > - for (i = 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) { > > + for (i = 0; i < ZONE_NUMBER; ++i) { > > struct tegra_thermctl_zone *zone = > > devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL); > > if (!zone) { > > err = -ENOMEM; > > - goto unregister_tzs; > > + goto disable_clocks; > > } > > > > zone->reg = tegra->regs + t124_thermctl_temp_zones[i].offset; > > zone->shift = t124_thermctl_temp_zones[i].shift; > > > > - tz = thermal_zone_of_sensor_register(&pdev->dev, i, zone, > > - &tegra_of_thermal_ops); > > - if (IS_ERR(tz)) { > > - err = PTR_ERR(tz); > > + z = devm_thermal_zone_of_sensor_register(&pdev->dev, i, zone, > > I prefer to still use "tz", it seems this line isn't over 80 characters, or we > can add newline.
Yeah,
> > > + &tegra_of_thermal_ops);
CHECK: Alignment should match open parenthesis #423: FILE: drivers/thermal/tegra_soctherm.c:423: + tz = devm_thermal_zone_of_sensor_register(&pdev->dev, i, zone, + &tegra_of_thermal_ops);
and if you align it, then, you get the warning: WARNING: line over 80 characters #423: FILE: drivers/thermal/tegra_soctherm.c:423: + &tegra_of_thermal_ops);
And I did not want to add either of the above to the driver.
But if you prefer tz over z, we can keep the first (check) then.
What do you prefer?
[unhandled content-type:application/pgp-signature] | |