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 01/23] thermal: armada: add a function that sanitizes the thermal zone name Date: Thu, 5 Jul 2018 18:04:15 +0200 [thread overview] Message-ID: <20180705160437.12325-2-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20180705160437.12325-1-miquel.raynal@bootlin.com> Thermal zone names must follow certain rules imposed by the framework. They are limited in length and shall not have any hyphen '-'. This is done in a separate function for future use in another location. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/thermal/armada_thermal.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 4c275ec10ac5..077e8e562306 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -70,6 +70,7 @@ struct armada_thermal_priv { void __iomem *status; void __iomem *control0; void __iomem *control1; + char zone_name[THERMAL_NAME_LENGTH]; struct armada_thermal_data *data; }; @@ -353,6 +354,36 @@ static const struct of_device_id armada_thermal_id_table[] = { }; MODULE_DEVICE_TABLE(of, armada_thermal_id_table); +static void armada_set_sane_name(struct platform_device *pdev, + struct armada_thermal_priv *priv) +{ + const char *name = dev_name(&pdev->dev); + char *insane_char; + + if (strlen(name) > THERMAL_NAME_LENGTH) { + /* + * When inside a system controller, the device name has the + * form: f06f8000.system-controller:ap-thermal so stripping + * after the ':' should give us a shorter but meaningful name. + */ + name = strrchr(name, ':'); + if (!name) + name = "armada_thermal"; + else + name++; + } + + /* Save the name locally */ + strncpy(priv->zone_name, name, THERMAL_NAME_LENGTH); + + /* Then check there are no '-' or hwmon core will complain */ + do { + insane_char = strpbrk(priv->zone_name, "-"); + if (insane_char) + *insane_char = '_'; + } while (insane_char); +} + static int armada_thermal_probe(struct platform_device *pdev) { void __iomem *control = NULL; @@ -381,6 +412,9 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->data = (struct armada_thermal_data *)match->data; + /* Ensure device name is correct for the thermal core */ + armada_set_sane_name(pdev, priv); + /* * Legacy DT bindings only described "control1" register (also referred * as "control MSB" on old documentation). New bindings cover @@ -402,7 +436,7 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->data->init_sensor(pdev, priv); - thermal = thermal_zone_device_register(dev_name(&pdev->dev), 0, 0, priv, + thermal = thermal_zone_device_register(priv->zone_name, 0, 0, priv, &ops, NULL, 0, 0); if (IS_ERR(thermal)) { dev_err(&pdev->dev, -- 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 01/23] thermal: armada: add a function that sanitizes the thermal zone name Date: Thu, 5 Jul 2018 18:04:15 +0200 [thread overview] Message-ID: <20180705160437.12325-2-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20180705160437.12325-1-miquel.raynal@bootlin.com> Thermal zone names must follow certain rules imposed by the framework. They are limited in length and shall not have any hyphen '-'. This is done in a separate function for future use in another location. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/thermal/armada_thermal.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 4c275ec10ac5..077e8e562306 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -70,6 +70,7 @@ struct armada_thermal_priv { void __iomem *status; void __iomem *control0; void __iomem *control1; + char zone_name[THERMAL_NAME_LENGTH]; struct armada_thermal_data *data; }; @@ -353,6 +354,36 @@ static const struct of_device_id armada_thermal_id_table[] = { }; MODULE_DEVICE_TABLE(of, armada_thermal_id_table); +static void armada_set_sane_name(struct platform_device *pdev, + struct armada_thermal_priv *priv) +{ + const char *name = dev_name(&pdev->dev); + char *insane_char; + + if (strlen(name) > THERMAL_NAME_LENGTH) { + /* + * When inside a system controller, the device name has the + * form: f06f8000.system-controller:ap-thermal so stripping + * after the ':' should give us a shorter but meaningful name. + */ + name = strrchr(name, ':'); + if (!name) + name = "armada_thermal"; + else + name++; + } + + /* Save the name locally */ + strncpy(priv->zone_name, name, THERMAL_NAME_LENGTH); + + /* Then check there are no '-' or hwmon core will complain */ + do { + insane_char = strpbrk(priv->zone_name, "-"); + if (insane_char) + *insane_char = '_'; + } while (insane_char); +} + static int armada_thermal_probe(struct platform_device *pdev) { void __iomem *control = NULL; @@ -381,6 +412,9 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->data = (struct armada_thermal_data *)match->data; + /* Ensure device name is correct for the thermal core */ + armada_set_sane_name(pdev, priv); + /* * Legacy DT bindings only described "control1" register (also referred * as "control MSB" on old documentation). New bindings cover @@ -402,7 +436,7 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->data->init_sensor(pdev, priv); - thermal = thermal_zone_device_register(dev_name(&pdev->dev), 0, 0, priv, + thermal = thermal_zone_device_register(priv->zone_name, 0, 0, priv, &ops, NULL, 0, 0); if (IS_ERR(thermal)) { dev_err(&pdev->dev, -- 2.14.1
next prev parent reply other threads:[~2018-07-05 16:04 UTC|newest] Thread overview: 60+ 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 ` Miquel Raynal [this message] 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 ` [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 ` [PATCH v3 04/23] thermal: armada: rename the initialization routine Miquel Raynal 2018-07-05 16:04 ` 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 01/23] thermal: armada: add a function that sanitizes the thermal zone name Miquel Raynal 2018-07-16 14:41 ` Miquel Raynal 2018-07-27 11:34 ` Daniel Lezcano 2018-07-27 11:34 ` Daniel Lezcano 2018-07-27 11:52 ` Miquel Raynal 2018-07-27 11:52 ` Miquel Raynal 2018-07-27 15:29 ` Daniel Lezcano 2018-07-27 15:29 ` Daniel Lezcano 2018-07-29 19:27 ` Miquel Raynal 2018-07-29 19:27 ` Miquel Raynal 2018-07-30 6:16 ` Daniel Lezcano 2018-07-30 6:16 ` 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-2-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.