From patchwork Mon May 31 15:43:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 450541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3965C47080 for ; Mon, 31 May 2021 15:52:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80698610A8 for ; Mon, 31 May 2021 15:52:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233797AbhEaPxn (ORCPT ); Mon, 31 May 2021 11:53:43 -0400 Received: from mga17.intel.com ([192.55.52.151]:5456 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbhEaPvc (ORCPT ); Mon, 31 May 2021 11:51:32 -0400 IronPort-SDR: /LfIDPdao+dbiEowT+eGeEBaI/HQOVTXOGjnGQPoR/b+jumywikJmOQ2UFkaVJab5CvG2uwd9o 5SRz5HZDb5bA== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="183733374" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="183733374" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:45 -0700 IronPort-SDR: E2cRdlWDU8bCBCSGn0X40EqLjiY7bKk7LeaTpv7p8I5++9tIwWtMiu/FRHHC+WgEJO80mmVxpv VASRv3BWhWVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="548783833" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 31 May 2021 08:43:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2548473; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 2/5] pwm: core: Always require PWM flags to be provided Date: Mon, 31 May 2021 18:43:48 +0300 Message-Id: <20210531154351.53614-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- 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 () - * { , , [, ]}} + * Package () { "pwms", Package () { + * , , , , + * } + * } * * 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 From patchwork Mon May 31 15:43:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 450540 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10653C47080 for ; Mon, 31 May 2021 15:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB8B661263 for ; Mon, 31 May 2021 15:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232339AbhEaPzg (ORCPT ); Mon, 31 May 2021 11:55:36 -0400 Received: from mga01.intel.com ([192.55.52.88]:55656 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232269AbhEaPwg (ORCPT ); Mon, 31 May 2021 11:52:36 -0400 IronPort-SDR: 43H4sn0L5vaNFr+7BXNo9YCDUT845mHLaVW3ySn2nYMp+gJNsS4sPOPFSsTXy0wdiBTT3/8/ct 8UrgL1fzRUzA== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="224646681" X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="224646681" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2021 08:43:46 -0700 IronPort-SDR: Ze6F2cxgGNTOaPBhzTKwYC/VwMvmhciO/YebQki01o/HDH95rlBCW24a69hid73wIg4t0FP1dz DXIoyF0KWuFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,237,1616482800"; d="scan'208";a="616564760" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 31 May 2021 08:43:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 44455456; Mon, 31 May 2021 18:44:06 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Flavio Suligoi , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Thierry Reding , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones Subject: [PATCH v1 5/5] pwm: core: Unify fwnode checks in the module Date: Mon, 31 May 2021 18:43:51 +0300 Message-Id: <20210531154351.53614-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> References: <20210531154351.53614-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Historically we have two different approaches on how to check type of fwnode. Unify them using the latest and greatest fwnode related APIs. Signed-off-by: Andy Shevchenko --- drivers/pwm/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 2223a9b6644b..135eb5af9191 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -838,7 +838,7 @@ EXPORT_SYMBOL_GPL(of_pwm_get); * Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded * error code on failure. */ -static struct pwm_device *acpi_pwm_get(struct fwnode_handle *fwnode) +static struct pwm_device *acpi_pwm_get(const struct fwnode_handle *fwnode) { struct pwm_device *pwm = ERR_PTR(-ENODEV); struct fwnode_reference_args args; @@ -922,6 +922,7 @@ void pwm_remove_table(struct pwm_lookup *table, size_t num) */ struct pwm_device *pwm_get(struct device *dev, const char *con_id) { + const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL; const char *dev_id = dev ? dev_name(dev) : NULL; struct pwm_device *pwm; struct pwm_chip *chip; @@ -932,12 +933,12 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) int err; /* look up via DT first */ - if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) - return of_pwm_get(dev, dev->of_node, con_id); + if (is_of_node(fwnode)) + return of_pwm_get(dev, to_of_node(fwnode), con_id); /* then lookup via ACPI */ - if (dev && is_acpi_node(dev->fwnode)) { - pwm = acpi_pwm_get(dev->fwnode); + if (is_acpi_node(fwnode)) { + pwm = acpi_pwm_get(fwnode); if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) return pwm; }