From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Ni Subject: Re: [PATCH 12/13] thermal: convert tegra_thermal to use devm_thermal_zone_of_sensor_register Date: Thu, 10 Mar 2016 16:46:55 +0800 Message-ID: <56E1347F.8040406@nvidia.com> References: <1457559336-17652-1-git-send-email-edubezval@gmail.com> <1457559336-17652-13-git-send-email-edubezval@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1457559336-17652-13-git-send-email-edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Eduardo Valentin , Rui Zhang Cc: Linux PM , LKML , lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org, Stephen Warren , Thierry Reding , Alexandre Courbot , linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-pm@vger.kernel.org On 2016=E5=B9=B403=E6=9C=8810=E6=97=A5 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. >=20 > Cc: Zhang Rui > Cc: Stephen Warren > Cc: Thierry Reding > Cc: Alexandre Courbot > Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Signed-off-by: Eduardo Valentin > --- > drivers/thermal/tegra_soctherm.c | 31 +++++++++---------------------= - > 1 file changed, 9 insertions(+), 22 deletions(-) >=20 > 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; > =20 > - struct thermal_zone_device *thermctl_tzs[4]; > +#define ZONE_NUMBER 4 > }; > =20 > struct tsensor_shared_calibration { > @@ -342,7 +342,7 @@ static const struct thermctl_zone_desc t124_therm= ctl_temp_zones[] =3D { > 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) > =20 > /* Initialize thermctl sensors */ > =20 > - for (i =3D 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) { > + for (i =3D 0; i < ZONE_NUMBER; ++i) { > struct tegra_thermctl_zone *zone =3D > devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL); > if (!zone) { > err =3D -ENOMEM; > - goto unregister_tzs; > + goto disable_clocks; > } > =20 > zone->reg =3D tegra->regs + t124_thermctl_temp_zones[i].offset; > zone->shift =3D t124_thermctl_temp_zones[i].shift; > =20 > - tz =3D thermal_zone_of_sensor_register(&pdev->dev, i, zone, > - &tegra_of_thermal_ops); > - if (IS_ERR(tz)) { > - err =3D PTR_ERR(tz); > + z =3D 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. > + &tegra_of_thermal_ops); > + if (IS_ERR(z)) { > + err =3D PTR_ERR(z); > dev_err(&pdev->dev, "failed to register sensor: %d\n", > err); > - goto unregister_tzs; > + goto disable_clocks; > } > - > - tegra->thermctl_tzs[i] =3D tz; > } > =20 > return 0; > =20 > -unregister_tzs: > - while (i--) > - thermal_zone_of_sensor_unregister(&pdev->dev, > - tegra->thermctl_tzs[i]); > - > disable_clocks: > clk_disable_unprepare(tegra->clock_tsensor); > clk_disable_unprepare(tegra->clock_soctherm); > @@ -448,12 +441,6 @@ disable_clocks: > static int tegra_soctherm_remove(struct platform_device *pdev) > { > struct tegra_soctherm *tegra =3D platform_get_drvdata(pdev); > - unsigned int i; > - > - for (i =3D 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) { > - thermal_zone_of_sensor_unregister(&pdev->dev, > - tegra->thermctl_tzs[i]); > - } > =20 > clk_disable_unprepare(tegra->clock_tsensor); > clk_disable_unprepare(tegra->clock_soctherm); >=20 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Ni Date: Thu, 10 Mar 2016 08:46:55 +0000 Subject: Re: [lm-sensors] [PATCH 12/13] thermal: convert tegra_thermal to use devm_thermal_zone_of_sensor_reg Message-Id: <56E1347F.8040406@nvidia.com> List-Id: References: <1457559336-17652-1-git-send-email-edubezval@gmail.com> <1457559336-17652-13-git-send-email-edubezval@gmail.com> In-Reply-To: <1457559336-17652-13-git-send-email-edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Eduardo Valentin , Rui Zhang Cc: Linux PM , LKML , lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org, Stephen Warren , Thierry Reding , Alexandre Courbot , linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org CgpPbiAyMDE25bm0MDPmnIgxMOaXpSAwNTozNSwgRWR1YXJkbyBWYWxlbnRpbiB3cm90ZToKPiBU aGlzIGNoYW5nZXMgdGhlIGRyaXZlciB0byB1c2UgdGhlIGRldm1fIHZlcnNpb24KPiBvZiB0aGVy bWFsX3pvbmVfb2Zfc2Vuc29yX3JlZ2lzdGVyIGFuZCBjbGVhbnMKPiB1cCB0aGUgIGxvY2FsIHBv aW50cyBhbmQgdW5yZWdpc3RlciBjYWxscy4KPiAKPiBDYzogWmhhbmcgUnVpIDxydWkuemhhbmdA aW50ZWwuY29tPgo+IENjOiBTdGVwaGVuIFdhcnJlbiA8c3dhcnJlbkB3d3dkb3Rvcmcub3JnPgo+ IENjOiBUaGllcnJ5IFJlZGluZyA8dGhpZXJyeS5yZWRpbmdAZ21haWwuY29tPgo+IENjOiBBbGV4 YW5kcmUgQ291cmJvdCA8Z251cm91QGdtYWlsLmNvbT4KPiBDYzogbGludXgtcG1Admdlci5rZXJu ZWwub3JnCj4gQ2M6IGxpbnV4LXRlZ3JhQHZnZXIua2VybmVsLm9yZwo+IENjOiBsaW51eC1rZXJu ZWxAdmdlci5rZXJuZWwub3JnCj4gU2lnbmVkLW9mZi1ieTogRWR1YXJkbyBWYWxlbnRpbiA8ZWR1 YmV6dmFsQGdtYWlsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy90aGVybWFsL3RlZ3JhX3NvY3RoZXJt LmMgfCAzMSArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2Vk LCA5IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL3RoZXJtYWwvdGVncmFfc29jdGhlcm0uYyBiL2RyaXZlcnMvdGhlcm1hbC90ZWdyYV9zb2N0 aGVybS5jCj4gaW5kZXggNzRlYTU3Ni4uMDAxOGNjZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3Ro ZXJtYWwvdGVncmFfc29jdGhlcm0uYwo+ICsrKyBiL2RyaXZlcnMvdGhlcm1hbC90ZWdyYV9zb2N0 aGVybS5jCj4gQEAgLTE2OCw3ICsxNjgsNyBAQCBzdHJ1Y3QgdGVncmFfc29jdGhlcm0gewo+ICAJ c3RydWN0IGNsayAqY2xvY2tfc29jdGhlcm07Cj4gIAl2b2lkIF9faW9tZW0gKnJlZ3M7Cj4gIAo+ IC0Jc3RydWN0IHRoZXJtYWxfem9uZV9kZXZpY2UgKnRoZXJtY3RsX3R6c1s0XTsKPiArI2RlZmlu ZSBaT05FX05VTUJFUgkJNAo+ICB9Owo+ICAKPiAgc3RydWN0IHRzZW5zb3Jfc2hhcmVkX2NhbGli cmF0aW9uIHsKPiBAQCAtMzQyLDcgKzM0Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdGhlcm1j dGxfem9uZV9kZXNjIHQxMjRfdGhlcm1jdGxfdGVtcF96b25lc1tdID0gewo+ICBzdGF0aWMgaW50 IHRlZ3JhX3NvY3RoZXJtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gIHsK PiAgCXN0cnVjdCB0ZWdyYV9zb2N0aGVybSAqdGVncmE7Cj4gLQlzdHJ1Y3QgdGhlcm1hbF96b25l X2RldmljZSAqdHo7Cj4gKwlzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqejsKPiAgCXN0cnVj dCB0c2Vuc29yX3NoYXJlZF9jYWxpYnJhdGlvbiBzaGFyZWRfY2FsaWI7Cj4gIAlzdHJ1Y3QgcmVz b3VyY2UgKnJlczsKPiAgCXVuc2lnbmVkIGludCBpOwo+IEBAIC00MDgsMzYgKzQwOCwyOSBAQCBz dGF0aWMgaW50IHRlZ3JhX3NvY3RoZXJtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYpCj4gIAo+ICAJLyogSW5pdGlhbGl6ZSB0aGVybWN0bCBzZW5zb3JzICovCj4gIAo+IC0JZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUodGVncmEtPnRoZXJtY3RsX3R6cyk7ICsraSkgewo+ICsJ Zm9yIChpID0gMDsgaSA8IFpPTkVfTlVNQkVSOyArK2kpIHsKPiAgCQlzdHJ1Y3QgdGVncmFfdGhl cm1jdGxfem9uZSAqem9uZSA9Cj4gIAkJCWRldm1fa3phbGxvYygmcGRldi0+ZGV2LCBzaXplb2Yo KnpvbmUpLCBHRlBfS0VSTkVMKTsKPiAgCQlpZiAoIXpvbmUpIHsKPiAgCQkJZXJyID0gLUVOT01F TTsKPiAtCQkJZ290byB1bnJlZ2lzdGVyX3R6czsKPiArCQkJZ290byBkaXNhYmxlX2Nsb2NrczsK PiAgCQl9Cj4gIAo+ICAJCXpvbmUtPnJlZyA9IHRlZ3JhLT5yZWdzICsgdDEyNF90aGVybWN0bF90 ZW1wX3pvbmVzW2ldLm9mZnNldDsKPiAgCQl6b25lLT5zaGlmdCA9IHQxMjRfdGhlcm1jdGxfdGVt cF96b25lc1tpXS5zaGlmdDsKPiAgCj4gLQkJdHogPSB0aGVybWFsX3pvbmVfb2Zfc2Vuc29yX3Jl Z2lzdGVyKCZwZGV2LT5kZXYsIGksIHpvbmUsCj4gLQkJCQkJCSAgICAgJnRlZ3JhX29mX3RoZXJt YWxfb3BzKTsKPiAtCQlpZiAoSVNfRVJSKHR6KSkgewo+IC0JCQllcnIgPSBQVFJfRVJSKHR6KTsK PiArCQl6ID0gZGV2bV90aGVybWFsX3pvbmVfb2Zfc2Vuc29yX3JlZ2lzdGVyKCZwZGV2LT5kZXYs IGksIHpvbmUsCgpJIHByZWZlciB0byBzdGlsbCB1c2UgInR6IiwgaXQgc2VlbXMgdGhpcyBsaW5l IGlzbid0IG92ZXIgODAgY2hhcmFjdGVycywgb3Igd2UKY2FuIGFkZCBuZXdsaW5lLgoKPiArCQkJ CQkJCSAmdGVncmFfb2ZfdGhlcm1hbF9vcHMpOwo+ICsJCWlmIChJU19FUlIoeikpIHsKPiArCQkJ ZXJyID0gUFRSX0VSUih6KTsKPiAgCQkJZGV2X2VycigmcGRldi0+ZGV2LCAiZmFpbGVkIHRvIHJl Z2lzdGVyIHNlbnNvcjogJWRcbiIsCj4gIAkJCQllcnIpOwo+IC0JCQlnb3RvIHVucmVnaXN0ZXJf dHpzOwo+ICsJCQlnb3RvIGRpc2FibGVfY2xvY2tzOwo+ICAJCX0KPiAtCj4gLQkJdGVncmEtPnRo ZXJtY3RsX3R6c1tpXSA9IHR6Owo+ICAJfQo+ICAKPiAgCXJldHVybiAwOwo+ICAKPiAtdW5yZWdp c3Rlcl90enM6Cj4gLQl3aGlsZSAoaS0tKQo+IC0JCXRoZXJtYWxfem9uZV9vZl9zZW5zb3JfdW5y ZWdpc3RlcigmcGRldi0+ZGV2LAo+IC0JCQkJCQkgIHRlZ3JhLT50aGVybWN0bF90enNbaV0pOwo+ IC0KPiAgZGlzYWJsZV9jbG9ja3M6Cj4gIAljbGtfZGlzYWJsZV91bnByZXBhcmUodGVncmEtPmNs b2NrX3RzZW5zb3IpOwo+ICAJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKHRlZ3JhLT5jbG9ja19zb2N0 aGVybSk7Cj4gQEAgLTQ0OCwxMiArNDQxLDYgQEAgZGlzYWJsZV9jbG9ja3M6Cj4gIHN0YXRpYyBp bnQgdGVncmFfc29jdGhlcm1fcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4g IHsKPiAgCXN0cnVjdCB0ZWdyYV9zb2N0aGVybSAqdGVncmEgPSBwbGF0Zm9ybV9nZXRfZHJ2ZGF0 YShwZGV2KTsKPiAtCXVuc2lnbmVkIGludCBpOwo+IC0KPiAtCWZvciAoaSA9IDA7IGkgPCBBUlJB WV9TSVpFKHRlZ3JhLT50aGVybWN0bF90enMpOyArK2kpIHsKPiAtCQl0aGVybWFsX3pvbmVfb2Zf c2Vuc29yX3VucmVnaXN0ZXIoJnBkZXYtPmRldiwKPiAtCQkJCQkJICB0ZWdyYS0+dGhlcm1jdGxf dHpzW2ldKTsKPiAtCX0KPiAgCj4gIAljbGtfZGlzYWJsZV91bnByZXBhcmUodGVncmEtPmNsb2Nr X3RzZW5zb3IpOwo+ICAJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKHRlZ3JhLT5jbG9ja19zb2N0aGVy bSk7Cj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwps bS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6Ly9s aXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935237AbcCJIrG (ORCPT ); Thu, 10 Mar 2016 03:47:06 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:3783 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932227AbcCJIq6 convert rfc822-to-8bit (ORCPT ); Thu, 10 Mar 2016 03:46:58 -0500 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Thu, 10 Mar 2016 00:46:21 -0800 Message-ID: <56E1347F.8040406@nvidia.com> Date: Thu, 10 Mar 2016 16:46:55 +0800 From: Wei Ni User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Eduardo Valentin , Rui Zhang CC: Linux PM , LKML , , Stephen Warren , "Thierry Reding" , Alexandre Courbot , Subject: Re: [PATCH 12/13] thermal: convert tegra_thermal to use devm_thermal_zone_of_sensor_register References: <1457559336-17652-1-git-send-email-edubezval@gmail.com> <1457559336-17652-13-git-send-email-edubezval@gmail.com> In-Reply-To: <1457559336-17652-13-git-send-email-edubezval@gmail.com> X-Originating-IP: [10.19.224.146] X-ClientProxiedBy: DRBGMAIL101.nvidia.com (10.18.16.20) To HKMAIL101.nvidia.com (10.18.16.10) Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: Stephen Warren > Cc: Thierry Reding > Cc: Alexandre Courbot > Cc: linux-pm@vger.kernel.org > Cc: linux-tegra@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Eduardo Valentin > --- > 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. > + &tegra_of_thermal_ops); > + if (IS_ERR(z)) { > + err = PTR_ERR(z); > dev_err(&pdev->dev, "failed to register sensor: %d\n", > err); > - goto unregister_tzs; > + goto disable_clocks; > } > - > - tegra->thermctl_tzs[i] = tz; > } > > return 0; > > -unregister_tzs: > - while (i--) > - thermal_zone_of_sensor_unregister(&pdev->dev, > - tegra->thermctl_tzs[i]); > - > disable_clocks: > clk_disable_unprepare(tegra->clock_tsensor); > clk_disable_unprepare(tegra->clock_soctherm); > @@ -448,12 +441,6 @@ disable_clocks: > static int tegra_soctherm_remove(struct platform_device *pdev) > { > struct tegra_soctherm *tegra = platform_get_drvdata(pdev); > - unsigned int i; > - > - for (i = 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) { > - thermal_zone_of_sensor_unregister(&pdev->dev, > - tegra->thermctl_tzs[i]); > - } > > clk_disable_unprepare(tegra->clock_tsensor); > clk_disable_unprepare(tegra->clock_soctherm); >