[PATCH v2 2/7] pwm: core: Always require PWM flags to be provided

Andy Shevchenko
2021-05-31T19:49:44Z

It makes little sense to make PWM flags optional since in case
of multi-channel consumer the flags can be optional only for
the last listed channel. Thus always require PWM flags to be
provided.

Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no change
drivers/pwm/core.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index c165c5822703..25f7b3370672 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -852,8 +852,10 @@ static struct pwm_chip *device_to_pwmchip(struct device *dev)
*
* This is analogous to of_pwm_get() except con_id is not yet supported.
* ACPI entries must look like
- * Package () {"pwms", Package ()
- * { <PWM device reference>, <PWM index>, <PWM period> [, <PWM flags>]}}
+ * Package () { "pwms", Package () {
+ * <PWM device reference>, <PWM index>, <PWM period>, <PWM flags>,
+ * }
+ * }
*
* Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded
* error code on failure.
@@ -877,7 +879,7 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode)
if (!acpi)
return ERR_PTR(-EINVAL);

- if (args.nargs < 2)
+ if (args.nargs < 3)
return ERR_PTR(-EPROTO);

chip = device_to_pwmchip(&acpi->dev);
@@ -891,7 +893,7 @@ static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode)
pwm->args.period = args.args[1];
pwm->args.polarity = PWM_POLARITY_NORMAL;

- if (args.nargs > 2 && args.args[2] & PWM_POLARITY_INVERTED)
+ if (args.args[2] & PWM_POLARITY_INVERTED)
pwm->args.polarity = PWM_POLARITY_INVERSED;
#endif

--
2.30.2