[PATCH] mfd: tps6586x: correct device name of the regulator cell

[PATCH] mfd: tps6586x: correct device name of the regulator cell

[Marc Dietrich]

Change the device name of the regulator function to the one chosed for
MODULE_ALIAS. This fixes kernel module loading for the regulator function.
Also change the name of the platform driver to make everything consistent.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
I don't think this "fix" can still go into 3.10, but I would love to see
it there because otherwise many distro kernels supporting tegra2 would have
to force load the driver.

 drivers/mfd/tps6586x.c                 |    2 +-
 drivers/regulator/tps6586x-regulator.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 721b918..4b93ed4 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -107,7 +107,7 @@ static struct mfd_cell tps6586x_cell[] = {
 		.name = "tps6586x-gpio",
 	},
 	{
-		.name = "tps6586x-pmic",
+		.name = "tps6586x-regulator",
 	},
 	{
 		.name = "tps6586x-rtc",
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index d8fa37d..2c9155b 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -439,7 +439,7 @@ static int tps6586x_regulator_remove(struct platform_device *pdev)
 
 static struct platform_driver tps6586x_regulator_driver = {
 	.driver	= {
-		.name	= "tps6586x-pmic",
+		.name	= "tps6586x-regulator",
 		.owner	= THIS_MODULE,
 	},
 	.probe		= tps6586x_regulator_probe,
-- 
1.7.9.5

Re: [PATCH] mfd: tps6586x: correct device name of the regulator cell

[Stephen Warren]

On 06/10/2013 02:06 PM, Marc Dietrich wrote:
> Change the device name of the regulator function to the one chosed for

nit: s/chosed/chosen/

> MODULE_ALIAS. This fixes kernel module loading for the regulator function.

Not "loading" but "auto-loading" (based on a match of the MODULE_ALIAS
name).

> Also change the name of the platform driver to make everything consistent.

In this case, not really for consistency; if you didn't do that, it
simply wouldn't match the entry in tps6586x_cell[], so even with the
module loaded, the driver wouldn't get probed.

Re: [PATCH v2] mfd: tps6586x: correct device name of the regulator cell

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

On Mon, Jun 10, 2013 at 10:27:55PM +0200, Marc Dietrich wrote:
> Change the device name of the regulator function to the one chosen for
> MODULE_ALIAS. This fixes kernel auto-module loading for the regulator function.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]