From: Dong Aisheng <aisheng.dong@nxp.com> To: <linux-kernel@vger.kernel.org> Cc: <shawnguo@kernel.org>, <linux-arm-kernel@lists.infradead.org>, <aisheng.dong@nxp.com>, <kernel@pengutronix.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <yibin.gong@nxp.com> Subject: [PATCH 4/6] regulator: anatop: remove unneeded name field of struct anatop_regulator Date: Wed, 12 Apr 2017 09:58:45 +0800 [thread overview] Message-ID: <1491962327-12477-4-git-send-email-aisheng.dong@nxp.com> (raw) In-Reply-To: <1491962327-12477-1-git-send-email-aisheng.dong@nxp.com> sreg->name is only used as an intermediate assign of rdesc->name, plus another strcmp. Since we already have rdesc->name, no need it anymore. Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Robin Gong <yibin.gong@nxp.com> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> --- drivers/regulator/anatop-regulator.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c index 9481730..19eb1f4 100644 --- a/drivers/regulator/anatop-regulator.c +++ b/drivers/regulator/anatop-regulator.c @@ -39,7 +39,6 @@ #define LDO_FET_FULL_ON 0x1f struct anatop_regulator { - const char *name; u32 control_reg; struct regmap *anatop; int vol_bit_shift; @@ -194,12 +193,12 @@ static int anatop_regulator_probe(struct platform_device *pdev) if (!sreg) return -ENOMEM; - of_property_read_string(np, "regulator-name", &sreg->name); rdesc = &sreg->rdesc; - rdesc->name = sreg->name; rdesc->type = REGULATOR_VOLTAGE; rdesc->owner = THIS_MODULE; + of_property_read_string(np, "regulator-name", &rdesc->name); + initdata = of_get_regulator_init_data(dev, np, rdesc); if (!initdata) return -ENOMEM; @@ -299,7 +298,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) * a sane default until imx6-cpufreq was probed and changes the * voltage to the correct value. In this case we set 1.25V. */ - if (!sreg->sel && !strcmp(sreg->name, "vddpu")) + if (!sreg->sel && !strcmp(rdesc->name, "vddpu")) sreg->sel = 22; if (!sreg->bypass && !sreg->sel) { -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: aisheng.dong@nxp.com (Dong Aisheng) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] regulator: anatop: remove unneeded name field of struct anatop_regulator Date: Wed, 12 Apr 2017 09:58:45 +0800 [thread overview] Message-ID: <1491962327-12477-4-git-send-email-aisheng.dong@nxp.com> (raw) In-Reply-To: <1491962327-12477-1-git-send-email-aisheng.dong@nxp.com> sreg->name is only used as an intermediate assign of rdesc->name, plus another strcmp. Since we already have rdesc->name, no need it anymore. Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Robin Gong <yibin.gong@nxp.com> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> --- drivers/regulator/anatop-regulator.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c index 9481730..19eb1f4 100644 --- a/drivers/regulator/anatop-regulator.c +++ b/drivers/regulator/anatop-regulator.c @@ -39,7 +39,6 @@ #define LDO_FET_FULL_ON 0x1f struct anatop_regulator { - const char *name; u32 control_reg; struct regmap *anatop; int vol_bit_shift; @@ -194,12 +193,12 @@ static int anatop_regulator_probe(struct platform_device *pdev) if (!sreg) return -ENOMEM; - of_property_read_string(np, "regulator-name", &sreg->name); rdesc = &sreg->rdesc; - rdesc->name = sreg->name; rdesc->type = REGULATOR_VOLTAGE; rdesc->owner = THIS_MODULE; + of_property_read_string(np, "regulator-name", &rdesc->name); + initdata = of_get_regulator_init_data(dev, np, rdesc); if (!initdata) return -ENOMEM; @@ -299,7 +298,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) * a sane default until imx6-cpufreq was probed and changes the * voltage to the correct value. In this case we set 1.25V. */ - if (!sreg->sel && !strcmp(sreg->name, "vddpu")) + if (!sreg->sel && !strcmp(rdesc->name, "vddpu")) sreg->sel = 22; if (!sreg->bypass && !sreg->sel) { -- 2.7.4
next prev parent reply other threads:[~2017-04-11 10:02 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-12 1:58 [PATCH 1/6] regulator: anatop: check return value of of_get_regulator_init_data Dong Aisheng 2017-04-12 1:58 ` Dong Aisheng 2017-04-11 20:42 ` Applied "regulator: anatop: check return value of of_get_regulator_init_data" to the regulator tree Mark Brown 2017-04-11 20:42 ` Mark Brown 2017-04-12 1:58 ` [PATCH 2/6] regulator: anatop: only set supply regulator when it actually exists Dong Aisheng 2017-04-12 1:58 ` Dong Aisheng 2017-04-11 20:31 ` Mark Brown 2017-04-11 20:31 ` Mark Brown 2017-04-13 7:11 ` Dong Aisheng 2017-04-13 7:11 ` Dong Aisheng 2017-04-12 15:53 ` Mark Brown 2017-04-12 15:53 ` Mark Brown 2017-04-12 16:00 ` Dong Aisheng 2017-04-12 16:00 ` Dong Aisheng 2017-04-12 16:06 ` Mark Brown 2017-04-12 16:06 ` Mark Brown 2017-04-12 1:58 ` [PATCH 3/6] regulator: anatop: use of_property_read_string to read the name Dong Aisheng 2017-04-12 1:58 ` Dong Aisheng 2017-04-11 20:42 ` Applied "regulator: anatop: use of_property_read_string to read the name" to the regulator tree Mark Brown 2017-04-11 20:42 ` Mark Brown 2017-04-12 1:58 ` Dong Aisheng [this message] 2017-04-12 1:58 ` [PATCH 4/6] regulator: anatop: remove unneeded name field of struct anatop_regulator Dong Aisheng 2017-04-11 20:42 ` Applied "regulator: anatop: remove unneeded name field of struct anatop_regulator" to the regulator tree Mark Brown 2017-04-11 20:42 ` Mark Brown 2017-04-12 1:58 ` [PATCH 5/6] regulator: anatop-regulator: make regulator-name using optionally Dong Aisheng 2017-04-12 1:58 ` Dong Aisheng 2017-04-11 20:38 ` Mark Brown 2017-04-11 20:38 ` Mark Brown 2017-04-13 7:31 ` Dong Aisheng 2017-04-13 7:31 ` Dong Aisheng 2017-04-12 1:58 ` [PATCH 6/6] regulator: anatop: set default voltage selector for pcie Dong Aisheng 2017-04-12 1:58 ` Dong Aisheng 2017-04-11 20:40 ` Mark Brown 2017-04-11 20:40 ` Mark Brown 2017-04-13 7:41 ` Dong Aisheng 2017-04-13 7:41 ` Dong Aisheng 2017-04-12 15:49 ` Mark Brown 2017-04-12 15:49 ` Mark Brown 2017-04-12 16:11 ` Dong Aisheng 2017-04-12 16:11 ` Dong Aisheng 2017-04-12 16:11 ` Lucas Stach 2017-04-12 16:11 ` Lucas Stach 2017-04-12 16:16 ` Mark Brown 2017-04-12 16:16 ` Mark Brown
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=1491962327-12477-4-git-send-email-aisheng.dong@nxp.com \ --to=aisheng.dong@nxp.com \ --cc=broonie@kernel.org \ --cc=kernel@pengutronix.de \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=shawnguo@kernel.org \ --cc=yibin.gong@nxp.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.