[PATCH] regulator: lm363x: Remove struct lm363x_regulator which is not necessary

[Axel Lin]

Signed-off-by: Axel Lin 
---
 drivers/regulator/lm363x-regulator.c | 20 +---
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/regulator/lm363x-regulator.c 
b/drivers/regulator/lm363x-regulator.c
index e1b683e..3858735 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -41,18 +41,12 @@
 #define LM363X_STEP_50mV   5
 #define LM363X_STEP_500mV  50
 
-struct lm363x_regulator {
-   struct regmap *regmap;
-   struct regulator_dev *regulator;
-};
-
 const int ldo_cont_enable_time[] = {
0, 2000, 5000, 1, 2, 5, 10, 20,
 };
 
 static int lm363x_regulator_enable_time(struct regulator_dev *rdev)
 {
-   struct lm363x_regulator *lm363x_regulator = rdev_get_drvdata(rdev);
enum lm363x_regulator_id id = rdev_get_id(rdev);
u8 val, addr, mask;
 
@@ -77,7 +71,7 @@ static int lm363x_regulator_enable_time(struct regulator_dev 
*rdev)
return 0;
}
 
-   if (regmap_read(lm363x_regulator->regmap, addr, (unsigned int *)))
+   if (regmap_read(rdev->regmap, addr, (unsigned int *)))
return -EINVAL;
 
val = (val & mask) >> LM3631_ENTIME_SHIFT;
@@ -244,7 +238,6 @@ static int lm363x_regulator_of_get_enable_gpio(struct 
device_node *np, int id)
 static int lm363x_regulator_probe(struct platform_device *pdev)
 {
struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent);
-   struct lm363x_regulator *lm363x_regulator;
struct regmap *regmap = lmu->regmap;
struct regulator_config cfg = { };
struct regulator_dev *rdev;
@@ -252,15 +245,7 @@ static int lm363x_regulator_probe(struct platform_device 
*pdev)
int id = pdev->id;
int ret, ena_gpio;
 
-   lm363x_regulator = devm_kzalloc(dev, sizeof(*lm363x_regulator),
-   GFP_KERNEL);
-   if (!lm363x_regulator)
-   return -ENOMEM;
-
-   lm363x_regulator->regmap = regmap;
-
cfg.dev = dev;
-   cfg.driver_data = lm363x_regulator;
cfg.regmap = regmap;
 
/*
@@ -288,9 +273,6 @@ static int lm363x_regulator_probe(struct platform_device 
*pdev)
return ret;
}
 
-   lm363x_regulator->regulator = rdev;
-   platform_set_drvdata(pdev, lm363x_regulator);
-
return 0;
 }
 
-- 
2.1.4



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] regulator: lm363x: Remove struct lm363x_regulator which is not necessary

[Axel Lin]

Signed-off-by: Axel Lin 
---
 drivers/regulator/lm363x-regulator.c | 20 +---
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/regulator/lm363x-regulator.c 
b/drivers/regulator/lm363x-regulator.c
index e1b683e..3858735 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -41,18 +41,12 @@
 #define LM363X_STEP_50mV   5
 #define LM363X_STEP_500mV  50
 
-struct lm363x_regulator {
-   struct regmap *regmap;
-   struct regulator_dev *regulator;
-};
-
 const int ldo_cont_enable_time[] = {
0, 2000, 5000, 1, 2, 5, 10, 20,
 };
 
 static int lm363x_regulator_enable_time(struct regulator_dev *rdev)
 {
-   struct lm363x_regulator *lm363x_regulator = rdev_get_drvdata(rdev);
enum lm363x_regulator_id id = rdev_get_id(rdev);
u8 val, addr, mask;
 
@@ -77,7 +71,7 @@ static int lm363x_regulator_enable_time(struct regulator_dev 
*rdev)
return 0;
}
 
-   if (regmap_read(lm363x_regulator->regmap, addr, (unsigned int *)))
+   if (regmap_read(rdev->regmap, addr, (unsigned int *)))
return -EINVAL;
 
val = (val & mask) >> LM3631_ENTIME_SHIFT;
@@ -244,7 +238,6 @@ static int lm363x_regulator_of_get_enable_gpio(struct 
device_node *np, int id)
 static int lm363x_regulator_probe(struct platform_device *pdev)
 {
struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent);
-   struct lm363x_regulator *lm363x_regulator;
struct regmap *regmap = lmu->regmap;
struct regulator_config cfg = { };
struct regulator_dev *rdev;
@@ -252,15 +245,7 @@ static int lm363x_regulator_probe(struct platform_device 
*pdev)
int id = pdev->id;
int ret, ena_gpio;
 
-   lm363x_regulator = devm_kzalloc(dev, sizeof(*lm363x_regulator),
-   GFP_KERNEL);
-   if (!lm363x_regulator)
-   return -ENOMEM;
-
-   lm363x_regulator->regmap = regmap;
-
cfg.dev = dev;
-   cfg.driver_data = lm363x_regulator;
cfg.regmap = regmap;
 
/*
@@ -288,9 +273,6 @@ static int lm363x_regulator_probe(struct platform_device 
*pdev)
return ret;
}
 
-   lm363x_regulator->regulator = rdev;
-   platform_set_drvdata(pdev, lm363x_regulator);
-
return 0;
 }
 
-- 
2.1.4



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/