diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-01-16 18:16:44 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-18 09:43:10 +0100 |
| commit | 851960f4e8c9554b93402fab072acf243386fe42 (patch) | |
| tree | 5e5f848c4db14cec7e325cfaf3366acf8705d54f /drivers/regulator | |
| parent | 2787c15908a42dc3ee35e1a8037c634afe535b37 (diff) | |
| download | barebox-851960f4e8c9554b93402fab072acf243386fe42.tar.gz barebox-851960f4e8c9554b93402fab072acf243386fe42.tar.xz | |
regulator: Convert drivers to use struct regulator_desc
To simplify porting kernel code, port a very basic struct
regulator_desc and convert all of the code to use it.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/bcm2835.c | 6 | ||||
| -rw-r--r-- | drivers/regulator/core.c | 8 | ||||
| -rw-r--r-- | drivers/regulator/fixed.c | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/drivers/regulator/bcm2835.c b/drivers/regulator/bcm2835.c index 0ada05db16..ea7cf7fe1e 100644 --- a/drivers/regulator/bcm2835.c +++ b/drivers/regulator/bcm2835.c @@ -24,6 +24,7 @@ static struct regulator_bcm2835 { struct device_d *dev; struct regulator_dev rdev; + struct regulator_desc rdesc; } regs[] = { REG_DEV(BCM2835_MBOX_POWER_DEVID_SDHCI, "bcm2835_mci0"), REG_DEV(BCM2835_MBOX_POWER_DEVID_UART0, "uart0-pl0110"), @@ -108,7 +109,7 @@ static int regulator_bcm2835_is_enabled(struct regulator_dev *rdev) return msg_pwr->get_power_state.body.resp.state; } -static struct regulator_ops bcm2835_ops = { +const static struct regulator_ops bcm2835_ops = { .enable = regulator_bcm2835_enable, .disable = regulator_bcm2835_disable, .is_enabled = regulator_bcm2835_is_enabled, @@ -122,7 +123,8 @@ static int regulator_bcm2835_probe(struct device_d *dev) for (i = 0; i < ARRAY_SIZE(regs); i++) { rb = ®s[i]; - rb->rdev.ops = &bcm2835_ops; + rb->rdesc.ops = &bcm2835_ops; + rb->rdev.desc = &rb->rdesc; rb->dev = dev; ret = dev_regulator_register(&rb->rdev, rb->devname, NULL); diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 39df980dcb..bcfbda62e3 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -52,10 +52,10 @@ static int regulator_enable_internal(struct regulator_internal *ri) return 0; } - if (!ri->rdev->ops->enable) + if (!ri->rdev->desc->ops->enable) return -ENOSYS; - ret = ri->rdev->ops->enable(ri->rdev); + ret = ri->rdev->desc->ops->enable(ri->rdev); if (ret) return ret; @@ -74,10 +74,10 @@ static int regulator_disable_internal(struct regulator_internal *ri) if (!ri->enable_count) return -EINVAL; - if (!ri->rdev->ops->disable) + if (!ri->rdev->desc->ops->disable) return -ENOSYS; - ret = ri->rdev->ops->disable(ri->rdev); + ret = ri->rdev->desc->ops->disable(ri->rdev); if (ret) return ret; diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 87554d22e3..cb5d785817 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -29,6 +29,7 @@ struct regulator_fixed { int active_low; int always_on; struct regulator_dev rdev; + struct regulator_desc rdesc; }; static int regulator_fixed_enable(struct regulator_dev *rdev) @@ -54,7 +55,7 @@ static int regulator_fixed_disable(struct regulator_dev *rdev) return gpio_direction_output(fix->gpio, fix->active_low); } -static struct regulator_ops fixed_ops = { +const static struct regulator_ops fixed_ops = { .enable = regulator_fixed_enable, .disable = regulator_fixed_disable, }; @@ -82,7 +83,8 @@ static int regulator_fixed_probe(struct device_d *dev) fix->active_low = 1; } - fix->rdev.ops = &fixed_ops; + fix->rdesc.ops = &fixed_ops; + fix->rdev.desc = &fix->rdesc; if (of_find_property(dev->device_node, "regulator-always-on", NULL)) { fix->always_on = 1; |