From: Daniel Lezcano <daniel.lezcano@linexp.org> To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: rui.zhang@intel.com, khilman@baylibre.com, abailon@baylibre.com, amitk@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE) Subject: [PATCH v1 30/33] thermal/drivers/bcm2835: Switch to new of thermal API Date: Sun, 10 Jul 2022 23:24:20 +0200 [thread overview] Message-ID: <20220710212423.681301-31-daniel.lezcano@linexp.org> (raw) In-Reply-To: <20220710212423.681301-1-daniel.lezcano@linexp.org> The thermal OF code has a new API allowing to migrate the OF initialization to a simpler approach. Use this new API. Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org> --- drivers/thermal/broadcom/bcm2835_thermal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c index c8e4344d5a3d..4a7c6270dfac 100644 --- a/drivers/thermal/broadcom/bcm2835_thermal.c +++ b/drivers/thermal/broadcom/bcm2835_thermal.c @@ -88,9 +88,9 @@ static int bcm2835_thermal_temp2adc(int temp, int offset, int slope) return temp; } -static int bcm2835_thermal_get_temp(void *d, int *temp) +static int bcm2835_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { - struct bcm2835_thermal_data *data = d; + struct bcm2835_thermal_data *data = tz->devdata; u32 val = readl(data->regs + BCM2835_TS_TSENSSTAT); if (!(val & BCM2835_TS_TSENSSTAT_VALID)) @@ -135,7 +135,7 @@ static void bcm2835_thermal_debugfs(struct platform_device *pdev) debugfs_create_regset32("regset", 0444, data->debugfsdir, regset); } -static const struct thermal_zone_of_device_ops bcm2835_thermal_ops = { +static struct thermal_zone_device_ops bcm2835_thermal_ops = { .get_temp = bcm2835_thermal_get_temp, }; @@ -206,8 +206,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) data->clk, rate); /* register of thermal sensor and get info from DT */ - tz = thermal_zone_of_sensor_register(&pdev->dev, 0, data, - &bcm2835_thermal_ops); + tz = devm_thermal_of_zone_register(&pdev->dev, 0, data, + &bcm2835_thermal_ops); if (IS_ERR(tz)) { err = PTR_ERR(tz); dev_err(&pdev->dev, @@ -277,7 +277,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) return 0; err_tz: - thermal_zone_of_sensor_unregister(&pdev->dev, tz); + thermal_of_zone_unregister(tz); err_clk: clk_disable_unprepare(data->clk); @@ -290,7 +290,7 @@ static int bcm2835_thermal_remove(struct platform_device *pdev) struct thermal_zone_device *tz = data->tz; debugfs_remove_recursive(data->debugfsdir); - thermal_zone_of_sensor_unregister(&pdev->dev, tz); + thermal_of_zone_unregister(tz); clk_disable_unprepare(data->clk); return 0; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Lezcano <daniel.lezcano@linexp.org> To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: rui.zhang@intel.com, khilman@baylibre.com, abailon@baylibre.com, amitk@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE) Subject: [PATCH v1 30/33] thermal/drivers/bcm2835: Switch to new of thermal API Date: Sun, 10 Jul 2022 23:24:20 +0200 [thread overview] Message-ID: <20220710212423.681301-31-daniel.lezcano@linexp.org> (raw) In-Reply-To: <20220710212423.681301-1-daniel.lezcano@linexp.org> The thermal OF code has a new API allowing to migrate the OF initialization to a simpler approach. Use this new API. Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org> --- drivers/thermal/broadcom/bcm2835_thermal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c index c8e4344d5a3d..4a7c6270dfac 100644 --- a/drivers/thermal/broadcom/bcm2835_thermal.c +++ b/drivers/thermal/broadcom/bcm2835_thermal.c @@ -88,9 +88,9 @@ static int bcm2835_thermal_temp2adc(int temp, int offset, int slope) return temp; } -static int bcm2835_thermal_get_temp(void *d, int *temp) +static int bcm2835_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { - struct bcm2835_thermal_data *data = d; + struct bcm2835_thermal_data *data = tz->devdata; u32 val = readl(data->regs + BCM2835_TS_TSENSSTAT); if (!(val & BCM2835_TS_TSENSSTAT_VALID)) @@ -135,7 +135,7 @@ static void bcm2835_thermal_debugfs(struct platform_device *pdev) debugfs_create_regset32("regset", 0444, data->debugfsdir, regset); } -static const struct thermal_zone_of_device_ops bcm2835_thermal_ops = { +static struct thermal_zone_device_ops bcm2835_thermal_ops = { .get_temp = bcm2835_thermal_get_temp, }; @@ -206,8 +206,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) data->clk, rate); /* register of thermal sensor and get info from DT */ - tz = thermal_zone_of_sensor_register(&pdev->dev, 0, data, - &bcm2835_thermal_ops); + tz = devm_thermal_of_zone_register(&pdev->dev, 0, data, + &bcm2835_thermal_ops); if (IS_ERR(tz)) { err = PTR_ERR(tz); dev_err(&pdev->dev, @@ -277,7 +277,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) return 0; err_tz: - thermal_zone_of_sensor_unregister(&pdev->dev, tz); + thermal_of_zone_unregister(tz); err_clk: clk_disable_unprepare(data->clk); @@ -290,7 +290,7 @@ static int bcm2835_thermal_remove(struct platform_device *pdev) struct thermal_zone_device *tz = data->tz; debugfs_remove_recursive(data->debugfsdir); - thermal_zone_of_sensor_unregister(&pdev->dev, tz); + thermal_of_zone_unregister(tz); clk_disable_unprepare(data->clk); return 0; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-07-10 21:27 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-10 21:23 [PATCH v1 00/33] New thermal OF code Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 01/33] thermal/of: Rework the thermal device tree initialization Daniel Lezcano 2022-07-12 2:40 ` Guenter Roeck 2022-07-10 21:23 ` [PATCH v1 02/33] thermal/of: Make new code and old code co-exist Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 03/33] thermal/drivers/rockchip: Switch to new of API Daniel Lezcano 2022-07-10 21:23 ` Daniel Lezcano 2022-07-10 21:23 ` Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 04/33] thermal/drivers/uniphier: " Daniel Lezcano 2022-07-10 21:23 ` Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 05/33] thermal/drivers/generic-adc: " Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 06/33] thermal/drivers/mmio: " Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 07/33] thermal/drivers/tegra: " Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 08/33] thermal/drivers/sun8i: " Daniel Lezcano 2022-07-10 21:23 ` Daniel Lezcano 2022-07-10 21:23 ` [PATCH v1 09/33] thermal/drivers/sprd: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 10/33] thermal/drivers/broadcom: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-11 2:37 ` Florian Fainelli 2022-07-11 2:37 ` Florian Fainelli 2022-07-10 21:24 ` [PATCH v1 11/33] thermal/drivers/qcom: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 12/33] thermal/drivers/st: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 13/33] thermal/drivers/amlogic: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 14/33] thermal/drivers/armada: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 15/33] thermal/drivers/db8500: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 16/33] thermal/drivers/imx: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 17/33] thermal/drivers/rcar: " Daniel Lezcano 2022-07-19 9:10 ` Niklas Söderlund 2022-07-22 19:34 ` Daniel Lezcano 2022-07-24 18:27 ` Daniel Lezcano 2022-07-24 19:00 ` Niklas Söderlund 2022-07-24 21:11 ` Daniel Lezcano 2022-07-24 22:39 ` Niklas Söderlund 2022-07-24 23:28 ` Niklas Söderlund 2022-07-25 10:00 ` Daniel Lezcano 2022-07-25 10:38 ` Niklas Söderlund 2022-07-25 21:09 ` Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 18/33] thermal/drivers/rzg2l: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 19/33] thermal/drivers/qoriq: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 20/33] thermal/drivers/mtk: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 21/33] thermal/drivers/banggap: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 22/33] thermal/drivers/maxim: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 23/33] thermal/drivers/hisilicon: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 24/33] thermal/drivers/ti-soc: " Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 25/33] ata/drivers/ahci_imx: Switch to new of thermal API Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 23:18 ` Damien Le Moal 2022-07-10 23:18 ` Damien Le Moal 2022-07-11 9:14 ` Daniel Lezcano 2022-07-11 9:14 ` Daniel Lezcano 2022-07-11 10:37 ` Damien Le Moal 2022-07-11 10:37 ` Damien Le Moal 2022-07-10 21:24 ` [PATCH v1 26/33] hwmon/drivers: " Daniel Lezcano 2022-07-13 13:43 ` Guenter Roeck 2022-07-10 21:24 ` [PATCH v1 27/33] iio/drivers/sun4i_gpadc: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-11 7:52 ` Lars-Peter Clausen 2022-07-11 7:52 ` Lars-Peter Clausen 2022-07-10 21:24 ` [PATCH v1 28/33] input/drivers/touchscreen_sun4i: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-11 3:28 ` Dmitry Torokhov 2022-07-11 3:28 ` Dmitry Torokhov 2022-07-10 21:24 ` [PATCH v1 29/33] regulator/drivers/max8976: " Daniel Lezcano 2022-07-11 11:02 ` Mark Brown 2022-07-10 21:24 ` Daniel Lezcano [this message] 2022-07-10 21:24 ` [PATCH v1 30/33] thermal/drivers/bcm2835: " Daniel Lezcano 2022-07-11 2:40 ` Florian Fainelli 2022-07-11 2:40 ` Florian Fainelli 2022-07-10 21:24 ` [PATCH v1 31/33] thermal/drivers/samsung: " Daniel Lezcano 2022-07-10 21:24 ` Daniel Lezcano 2022-07-11 10:41 ` Krzysztof Kozlowski 2022-07-11 10:41 ` Krzysztof Kozlowski 2022-07-10 21:24 ` [PATCH v1 32/33] thermal/core: Move set_trip_temp ops to the sysfs code Daniel Lezcano 2022-07-10 21:24 ` [PATCH v1 33/33] thermal/of: Remove old OF code Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220710212423.681301-31-daniel.lezcano@linexp.org \ --to=daniel.lezcano@linexp.org \ --cc=abailon@baylibre.com \ --cc=amitk@kernel.org \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=daniel.lezcano@linaro.org \ --cc=f.fainelli@gmail.com \ --cc=khilman@baylibre.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=rafael@kernel.org \ --cc=rjui@broadcom.com \ --cc=rui.zhang@intel.com \ --cc=sbranden@broadcom.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.