Skip to content

pwm: Make .get_state() callback return an error code #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrusel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pwm: Make .get_state() callback return an error code #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pwm-dmec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ static inline struct dmec_pwm_chip *to_dmec(struct pwm_chip *chip)
return container_of(chip, struct dmec_pwm_chip, chip);
}

static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
static int dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
struct pwm_state *state)
{
dmec_pwm_channel *channel;
Expand All @@ -281,7 +281,7 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
if ((pwm->hwpwm == 1) && (channels[0].mode)) /* channel 1 in 16-bit mode is not active */
{
dev_info(chip->dev, "second PWM channel is not active in 16-bit mode\n");
return;
return 0;
}

if (pwm->hwpwm == 1) /* channel 1 */
Expand All @@ -306,7 +306,7 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret < 0)
{
dev_err(chip->dev, "%s: Failed to read PWM config\n", pwm->label);
return;
return 0;
}

/* mode : 1= 16bit, 0=8bit*/
Expand All @@ -332,7 +332,7 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret < 0)
{
dev_err(chip->dev, "%s: Failed to read PWM scaler\n", pwm->label);
return;
return 0;
}
channel->scaler = val;

Expand All @@ -341,7 +341,7 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret < 0)
{
dev_err(chip->dev, "%s: Failed to read PWM period\n", pwm->label);
return;
return 0;
}
channel->state.period = val;

Expand All @@ -350,7 +350,7 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret < 0)
{
dev_err(chip->dev, "%s: Failed to read PWM duty-cycle\n", pwm->label);
return;
return 0;
}
channel->state.duty_cycle = val;

Expand All @@ -367,6 +367,8 @@ static void dmec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
}

*state = channel->state;

return 0;
}

static int dmec_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
Expand Down