From: Miquel Raynal <miquel.raynal@bootlin.com> To: Gregory Clement <gregory.clement@bootlin.com>, Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com> Cc: Mark Rutland <mark.rutland@arm.com>, devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>, linux-pm@vger.kernel.org, Antoine Tenart <antoine.tenart@bootlin.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Maxime Chevallier <maxime.chevallier@bootlin.com>, Nadav Haklai <nadavh@marvell.com>, David Sniatkiwicz <davidsn@marvell.com>, Rob Herring <robh+dt@kernel.org>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Miquel Raynal <miquel.raynal@bootlin.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 04/23] thermal: armada: rename the initialization routine Date: Thu, 5 Jul 2018 18:04:18 +0200 [thread overview] Message-ID: <20180705160437.12325-5-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20180705160437.12325-1-miquel.raynal@bootlin.com> Calling a hook ->init_sensor() while what is initialized is the IP itself and not the sensors is misleading. Rename the hook ->init() to avoid any confusion in later work bringing multi-sensors support. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/thermal/armada_thermal.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 18155e43e67f..3d22a6016b04 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -73,9 +73,9 @@ struct armada_thermal_priv { }; struct armada_thermal_data { - /* Initialize the sensor */ - void (*init_sensor)(struct platform_device *pdev, - struct armada_thermal_priv *); + /* Initialize the thermal IC */ + void (*init)(struct platform_device *pdev, + struct armada_thermal_priv *priv); /* Test for a valid sensor value (optional) */ bool (*is_valid)(struct armada_thermal_priv *); @@ -94,8 +94,8 @@ struct armada_thermal_data { bool needs_control0; }; -static void armadaxp_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armadaxp_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -117,8 +117,8 @@ static void armadaxp_init_sensor(struct platform_device *pdev, writel(reg, priv->status); } -static void armada370_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada370_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -136,8 +136,8 @@ static void armada370_init_sensor(struct platform_device *pdev, msleep(10); } -static void armada375_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada375_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -164,8 +164,8 @@ static void armada_wait_sensor_validity(struct armada_thermal_priv *priv) STATUS_POLL_TIMEOUT_US); } -static void armada380_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada380_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg = readl_relaxed(priv->control1); @@ -186,8 +186,8 @@ static void armada380_init_sensor(struct platform_device *pdev, armada_wait_sensor_validity(priv); } -static void armada_ap806_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada_ap806_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -247,7 +247,7 @@ static struct thermal_zone_device_ops ops = { }; static const struct armada_thermal_data armadaxp_data = { - .init_sensor = armadaxp_init_sensor, + .init = armadaxp_init, .temp_shift = 10, .temp_mask = 0x1ff, .coef_b = 3153000000ULL, @@ -257,7 +257,7 @@ static const struct armada_thermal_data armadaxp_data = { static const struct armada_thermal_data armada370_data = { .is_valid = armada_is_valid, - .init_sensor = armada370_init_sensor, + .init = armada370_init, .is_valid_bit = BIT(9), .temp_shift = 10, .temp_mask = 0x1ff, @@ -268,7 +268,7 @@ static const struct armada_thermal_data armada370_data = { static const struct armada_thermal_data armada375_data = { .is_valid = armada_is_valid, - .init_sensor = armada375_init_sensor, + .init = armada375_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x1ff, @@ -280,7 +280,7 @@ static const struct armada_thermal_data armada375_data = { static const struct armada_thermal_data armada380_data = { .is_valid = armada_is_valid, - .init_sensor = armada380_init_sensor, + .init = armada380_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x3ff, @@ -292,7 +292,7 @@ static const struct armada_thermal_data armada380_data = { static const struct armada_thermal_data armada_ap806_data = { .is_valid = armada_is_valid, - .init_sensor = armada_ap806_init_sensor, + .init = armada_ap806_init, .is_valid_bit = BIT(16), .temp_shift = 0, .temp_mask = 0x3ff, @@ -306,7 +306,7 @@ static const struct armada_thermal_data armada_ap806_data = { static const struct armada_thermal_data armada_cp110_data = { .is_valid = armada_is_valid, - .init_sensor = armada380_init_sensor, + .init = armada380_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x3ff, @@ -428,7 +428,7 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->control1 = control + CONTROL1_OFFSET; } - priv->data->init_sensor(pdev, priv); + priv->data->init(pdev, priv); thermal = thermal_zone_device_register(priv->zone_name, 0, 0, priv, &ops, NULL, 0, 0); -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: miquel.raynal@bootlin.com (Miquel Raynal) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 04/23] thermal: armada: rename the initialization routine Date: Thu, 5 Jul 2018 18:04:18 +0200 [thread overview] Message-ID: <20180705160437.12325-5-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20180705160437.12325-1-miquel.raynal@bootlin.com> Calling a hook ->init_sensor() while what is initialized is the IP itself and not the sensors is misleading. Rename the hook ->init() to avoid any confusion in later work bringing multi-sensors support. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/thermal/armada_thermal.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 18155e43e67f..3d22a6016b04 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -73,9 +73,9 @@ struct armada_thermal_priv { }; struct armada_thermal_data { - /* Initialize the sensor */ - void (*init_sensor)(struct platform_device *pdev, - struct armada_thermal_priv *); + /* Initialize the thermal IC */ + void (*init)(struct platform_device *pdev, + struct armada_thermal_priv *priv); /* Test for a valid sensor value (optional) */ bool (*is_valid)(struct armada_thermal_priv *); @@ -94,8 +94,8 @@ struct armada_thermal_data { bool needs_control0; }; -static void armadaxp_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armadaxp_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -117,8 +117,8 @@ static void armadaxp_init_sensor(struct platform_device *pdev, writel(reg, priv->status); } -static void armada370_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada370_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -136,8 +136,8 @@ static void armada370_init_sensor(struct platform_device *pdev, msleep(10); } -static void armada375_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada375_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -164,8 +164,8 @@ static void armada_wait_sensor_validity(struct armada_thermal_priv *priv) STATUS_POLL_TIMEOUT_US); } -static void armada380_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada380_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg = readl_relaxed(priv->control1); @@ -186,8 +186,8 @@ static void armada380_init_sensor(struct platform_device *pdev, armada_wait_sensor_validity(priv); } -static void armada_ap806_init_sensor(struct platform_device *pdev, - struct armada_thermal_priv *priv) +static void armada_ap806_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) { u32 reg; @@ -247,7 +247,7 @@ static struct thermal_zone_device_ops ops = { }; static const struct armada_thermal_data armadaxp_data = { - .init_sensor = armadaxp_init_sensor, + .init = armadaxp_init, .temp_shift = 10, .temp_mask = 0x1ff, .coef_b = 3153000000ULL, @@ -257,7 +257,7 @@ static const struct armada_thermal_data armadaxp_data = { static const struct armada_thermal_data armada370_data = { .is_valid = armada_is_valid, - .init_sensor = armada370_init_sensor, + .init = armada370_init, .is_valid_bit = BIT(9), .temp_shift = 10, .temp_mask = 0x1ff, @@ -268,7 +268,7 @@ static const struct armada_thermal_data armada370_data = { static const struct armada_thermal_data armada375_data = { .is_valid = armada_is_valid, - .init_sensor = armada375_init_sensor, + .init = armada375_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x1ff, @@ -280,7 +280,7 @@ static const struct armada_thermal_data armada375_data = { static const struct armada_thermal_data armada380_data = { .is_valid = armada_is_valid, - .init_sensor = armada380_init_sensor, + .init = armada380_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x3ff, @@ -292,7 +292,7 @@ static const struct armada_thermal_data armada380_data = { static const struct armada_thermal_data armada_ap806_data = { .is_valid = armada_is_valid, - .init_sensor = armada_ap806_init_sensor, + .init = armada_ap806_init, .is_valid_bit = BIT(16), .temp_shift = 0, .temp_mask = 0x3ff, @@ -306,7 +306,7 @@ static const struct armada_thermal_data armada_ap806_data = { static const struct armada_thermal_data armada_cp110_data = { .is_valid = armada_is_valid, - .init_sensor = armada380_init_sensor, + .init = armada380_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x3ff, @@ -428,7 +428,7 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->control1 = control + CONTROL1_OFFSET; } - priv->data->init_sensor(pdev, priv); + priv->data->init(pdev, priv); thermal = thermal_zone_device_register(priv->zone_name, 0, 0, priv, &ops, NULL, 0, 0); -- 2.14.1
next prev parent reply other threads:[~2018-07-05 16:04 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-05 16:04 [PATCH v3 00/23] Add multi-channel support to Armada thermal driver Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 01/23] thermal: armada: add a function that sanitizes the thermal zone name Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 02/23] thermal: armada: remove useless register accesses Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 03/23] thermal: armada: remove misleading comments Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal [this message] 2018-07-05 16:04 ` [PATCH v3 04/23] thermal: armada: rename the initialization routine Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 05/23] thermal: armada: dissociate a380 and cp110 ->init() hooks Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 06/23] thermal: armada: average over samples to avoid glitches Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 07/23] thermal: armada: convert driver to syscon register accesses Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 08/23] thermal: armada: use the resource managed registration helper alternative Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 09/23] thermal: armada: add multi-channel sensors support Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 10/23] thermal: armada: remove sensors validity from the IP initialization Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 11/23] thermal: armada: move validity check out of the read function Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 12/23] thermal: armada: get rid of the ->is_valid() pointer Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 13/23] dt-bindings: cp110: rename cp110 syscon file Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 14/23] dt-bindings: ap806: prepare the syscon file to list other syscons nodes Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 15/23] dt-bindings: cp110: " Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 16/23] dt-bindings: ap806: add the thermal node in the syscon file Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 17/23] dt-bindings: cp110: update documentation since DT de-duplication Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 18/23] dt-bindings: cp110: add the thermal node in the syscon file Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 19/23] dt-bindings: thermal: armada: add reference to new bindings Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 20/23] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 21/23] arm64: dts: marvell: add thermal-zone node in ap806 DTSI file Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 22/23] arm64: dts: marvell: add macro to make distinction between node names Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-05 16:04 ` [PATCH v3 23/23] arm64: dts: marvell: add thermal-zone node in cp110 DTSI file Miquel Raynal 2018-07-05 16:04 ` Miquel Raynal 2018-07-16 14:41 [PATCH v3 00/23] Add multi-channel support to Armada thermal driver Miquel Raynal 2018-07-16 14:41 ` [PATCH v3 04/23] thermal: armada: rename the initialization routine Miquel Raynal 2018-07-16 14:41 ` Miquel Raynal 2018-07-27 16:02 ` Daniel Lezcano 2018-07-27 16:02 ` 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=20180705160437.12325-5-miquel.raynal@bootlin.com \ --to=miquel.raynal@bootlin.com \ --cc=andrew@lunn.ch \ --cc=antoine.tenart@bootlin.com \ --cc=baruch@tkos.co.il \ --cc=catalin.marinas@arm.com \ --cc=davidsn@marvell.com \ --cc=devicetree@vger.kernel.org \ --cc=edubezval@gmail.com \ --cc=gregory.clement@bootlin.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maxime.chevallier@bootlin.com \ --cc=nadavh@marvell.com \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ --cc=sebastian.hesselbarth@gmail.com \ --cc=thomas.petazzoni@bootlin.com \ --cc=will.deacon@arm.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.