Skip to content

L
linux
Commit 46eec872 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files
Options

staging: greybus: pwm: Change prototype of helpers to prepare further changes 

This prepares the driver for further changes that will make it harder to
determine the pwm_chip from a given gb_pwm_chip. To just not have
to do that, rework gb_pwm_activate_operation(),
gb_pwm_deactivate_operation(), gb_pwm_config_operation(),
gb_pwm_set_polarity_operation(), gb_pwm_enable_operation() and
gb_pwm_disable_operation() to take a pwm_chip. Also use the pwm_chip as
driver data instead of the gb_pwm_chip.
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/ef9b346d5bab508d4ded81cf115bf244938d04f1.1707900770.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 4b2b7b1e
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 31 deletions
drivers/staging/greybus/pwm.c
View file @ 46eec872
...@@ -39,9 +39,9 @@ static int gb_pwm_count_operation(struct gb_pwm_chip *pwmc) ...@@ -39,9 +39,9 @@ static int gb_pwm_count_operation(struct gb_pwm_chip *pwmc)
return 0; return 0;
} }
static int gb_pwm_activate_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_activate_operation(struct pwm_chip *chip, u8 which)
u8 which)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_activate_request request; struct gb_pwm_activate_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -51,7 +51,7 @@ static int gb_pwm_activate_operation(struct gb_pwm_chip *pwmc, ...@@ -51,7 +51,7 @@ static int gb_pwm_activate_operation(struct gb_pwm_chip *pwmc,
request.which = which; request.which = which;
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
ret = gbphy_runtime_get_sync(gbphy_dev); ret = gbphy_runtime_get_sync(gbphy_dev);
if (ret) if (ret)
return ret; return ret;
...@@ -64,9 +64,9 @@ static int gb_pwm_activate_operation(struct gb_pwm_chip *pwmc, ...@@ -64,9 +64,9 @@ static int gb_pwm_activate_operation(struct gb_pwm_chip *pwmc,
return ret; return ret;
} }
static int gb_pwm_deactivate_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_deactivate_operation(struct pwm_chip *chip, u8 which)
u8 which)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_deactivate_request request; struct gb_pwm_deactivate_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -76,7 +76,7 @@ static int gb_pwm_deactivate_operation(struct gb_pwm_chip *pwmc, ...@@ -76,7 +76,7 @@ static int gb_pwm_deactivate_operation(struct gb_pwm_chip *pwmc,
request.which = which; request.which = which;
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
ret = gbphy_runtime_get_sync(gbphy_dev); ret = gbphy_runtime_get_sync(gbphy_dev);
if (ret) if (ret)
return ret; return ret;
...@@ -89,9 +89,10 @@ static int gb_pwm_deactivate_operation(struct gb_pwm_chip *pwmc, ...@@ -89,9 +89,10 @@ static int gb_pwm_deactivate_operation(struct gb_pwm_chip *pwmc,
return ret; return ret;
} }
static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_config_operation(struct pwm_chip *chip,
u8 which, u32 duty, u32 period) u8 which, u32 duty, u32 period)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_config_request request; struct gb_pwm_config_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -103,7 +104,7 @@ static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc, ...@@ -103,7 +104,7 @@ static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc,
request.duty = cpu_to_le32(duty); request.duty = cpu_to_le32(duty);
request.period = cpu_to_le32(period); request.period = cpu_to_le32(period);
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
ret = gbphy_runtime_get_sync(gbphy_dev); ret = gbphy_runtime_get_sync(gbphy_dev);
if (ret) if (ret)
return ret; return ret;
...@@ -116,9 +117,10 @@ static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc, ...@@ -116,9 +117,10 @@ static int gb_pwm_config_operation(struct gb_pwm_chip *pwmc,
return ret; return ret;
} }
static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_set_polarity_operation(struct pwm_chip *chip,
u8 which, u8 polarity) u8 which, u8 polarity)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_polarity_request request; struct gb_pwm_polarity_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -129,7 +131,7 @@ static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc, ...@@ -129,7 +131,7 @@ static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc,
request.which = which; request.which = which;
request.polarity = polarity; request.polarity = polarity;
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
ret = gbphy_runtime_get_sync(gbphy_dev); ret = gbphy_runtime_get_sync(gbphy_dev);
if (ret) if (ret)
return ret; return ret;
...@@ -142,9 +144,9 @@ static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc, ...@@ -142,9 +144,9 @@ static int gb_pwm_set_polarity_operation(struct gb_pwm_chip *pwmc,
return ret; return ret;
} }
static int gb_pwm_enable_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_enable_operation(struct pwm_chip *chip, u8 which)
u8 which)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_enable_request request; struct gb_pwm_enable_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -154,7 +156,7 @@ static int gb_pwm_enable_operation(struct gb_pwm_chip *pwmc, ...@@ -154,7 +156,7 @@ static int gb_pwm_enable_operation(struct gb_pwm_chip *pwmc,
request.which = which; request.which = which;
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
ret = gbphy_runtime_get_sync(gbphy_dev); ret = gbphy_runtime_get_sync(gbphy_dev);
if (ret) if (ret)
return ret; return ret;
...@@ -167,9 +169,9 @@ static int gb_pwm_enable_operation(struct gb_pwm_chip *pwmc, ...@@ -167,9 +169,9 @@ static int gb_pwm_enable_operation(struct gb_pwm_chip *pwmc,
return ret; return ret;
} }
static int gb_pwm_disable_operation(struct gb_pwm_chip *pwmc, static int gb_pwm_disable_operation(struct pwm_chip *chip, u8 which)
u8 which)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_pwm_disable_request request; struct gb_pwm_disable_request request;
struct gbphy_device *gbphy_dev; struct gbphy_device *gbphy_dev;
int ret; int ret;
...@@ -182,7 +184,7 @@ static int gb_pwm_disable_operation(struct gb_pwm_chip *pwmc, ...@@ -182,7 +184,7 @@ static int gb_pwm_disable_operation(struct gb_pwm_chip *pwmc,
ret = gb_operation_sync(pwmc->connection, GB_PWM_TYPE_DISABLE, ret = gb_operation_sync(pwmc->connection, GB_PWM_TYPE_DISABLE,
&request, sizeof(request), NULL, 0); &request, sizeof(request), NULL, 0);
gbphy_dev = to_gbphy_dev(pwmc->chip.dev); gbphy_dev = to_gbphy_dev(chip->dev);
gbphy_runtime_put_autosuspend(gbphy_dev); gbphy_runtime_put_autosuspend(gbphy_dev);
return ret; return ret;
...@@ -190,19 +192,15 @@ static int gb_pwm_disable_operation(struct gb_pwm_chip *pwmc, ...@@ -190,19 +192,15 @@ static int gb_pwm_disable_operation(struct gb_pwm_chip *pwmc,
static int gb_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) static int gb_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip); return gb_pwm_activate_operation(chip, pwm->hwpwm);
return gb_pwm_activate_operation(pwmc, pwm->hwpwm);
}; };
static void gb_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) static void gb_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
{ {
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
if (pwm_is_enabled(pwm)) if (pwm_is_enabled(pwm))
dev_warn(chip->dev, "freeing PWM device without disabling\n"); dev_warn(chip->dev, "freeing PWM device without disabling\n");
gb_pwm_deactivate_operation(pwmc, pwm->hwpwm); gb_pwm_deactivate_operation(chip, pwm->hwpwm);
} }
static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
...@@ -212,22 +210,21 @@ static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -212,22 +210,21 @@ static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
bool enabled = pwm->state.enabled; bool enabled = pwm->state.enabled;
u64 period = state->period; u64 period = state->period;
u64 duty_cycle = state->duty_cycle; u64 duty_cycle = state->duty_cycle;
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
/* Set polarity */ /* Set polarity */
if (state->polarity != pwm->state.polarity) { if (state->polarity != pwm->state.polarity) {
if (enabled) { if (enabled) {
gb_pwm_disable_operation(pwmc, pwm->hwpwm); gb_pwm_disable_operation(chip, pwm->hwpwm);
enabled = false; enabled = false;
} }
err = gb_pwm_set_polarity_operation(pwmc, pwm->hwpwm, state->polarity); err = gb_pwm_set_polarity_operation(chip, pwm->hwpwm, state->polarity);
if (err) if (err)
return err; return err;
} }
if (!state->enabled) { if (!state->enabled) {
if (enabled) if (enabled)
gb_pwm_disable_operation(pwmc, pwm->hwpwm); gb_pwm_disable_operation(chip, pwm->hwpwm);
return 0; return 0;
} }
...@@ -243,13 +240,13 @@ static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -243,13 +240,13 @@ static int gb_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
if (duty_cycle > period) if (duty_cycle > period)
duty_cycle = period; duty_cycle = period;
err = gb_pwm_config_operation(pwmc, pwm->hwpwm, duty_cycle, period); err = gb_pwm_config_operation(chip, pwm->hwpwm, duty_cycle, period);
if (err) if (err)
return err; return err;
/* enable/disable */ /* enable/disable */
if (!enabled) if (!enabled)
return gb_pwm_enable_operation(pwmc, pwm->hwpwm); return gb_pwm_enable_operation(chip, pwm->hwpwm);
return 0; return 0;
} }
...@@ -282,7 +279,7 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev, ...@@ -282,7 +279,7 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
pwmc->connection = connection; pwmc->connection = connection;
gb_connection_set_data(connection, pwmc); gb_connection_set_data(connection, pwmc);
gb_gbphy_set_data(gbphy_dev, pwmc); gb_gbphy_set_data(gbphy_dev, chip);
ret = gb_connection_enable(connection); ret = gb_connection_enable(connection);
if (ret) if (ret)
...@@ -320,7 +317,8 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev, ...@@ -320,7 +317,8 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
static void gb_pwm_remove(struct gbphy_device *gbphy_dev) static void gb_pwm_remove(struct gbphy_device *gbphy_dev)
{ {
struct gb_pwm_chip *pwmc = gb_gbphy_get_data(gbphy_dev); struct pwm_chip *chip = gb_gbphy_get_data(gbphy_dev);
struct gb_pwm_chip *pwmc = pwm_chip_to_gb_pwm_chip(chip);
struct gb_connection *connection = pwmc->connection; struct gb_connection *connection = pwmc->connection;
int ret; int ret;
...@@ -328,7 +326,7 @@ static void gb_pwm_remove(struct gbphy_device *gbphy_dev) ...@@ -328,7 +326,7 @@ static void gb_pwm_remove(struct gbphy_device *gbphy_dev)
if (ret) if (ret)
gbphy_runtime_get_noresume(gbphy_dev); gbphy_runtime_get_noresume(gbphy_dev);
pwmchip_remove(&pwmc->chip); pwmchip_remove(chip);
gb_connection_disable(connection); gb_connection_disable(connection);
gb_connection_destroy(connection); gb_connection_destroy(connection);
kfree(pwmc); kfree(pwmc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7