From patchwork Sat Aug 6 21:23:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1664275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=VtJ4CpKD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4M0b6y3kd0z9s5W for ; Sun, 7 Aug 2022 07:23:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233735AbiHFVXc (ORCPT ); Sat, 6 Aug 2022 17:23:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233166AbiHFVXa (ORCPT ); Sat, 6 Aug 2022 17:23:30 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F683F58C; Sat, 6 Aug 2022 14:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659821006; x=1691357006; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=y6RbBLDtDHHiMcqJ3KvDVm+exxMIOLcEhhJLr3Mcmm4=; b=VtJ4CpKD5b/mAC7RQzhS7oZ9WaEFrwvvJcubmZkbJIui1nWTDy8EsRJ3 WRsAhsIfbKTn9rgNzg8Zv/O1R/yISpvu9ln1J5iABHvl4zl+ZJOQQg5qV k9/x7Dy6aDbS/FZYSb1JXtqphsQyzeGIEav3aM1sfVbyRq3M5ovqB91LX C5hGw0AP29dOyruCDhzUdAxLexaIKdmwiDDp8JWiQZlsFwC7k2xifrOcQ HZ3ngZigN7Hr5rZLUUuRtCtMekHVOxDDxNQICkfoRy+JraZbG7V92A4F0 j6vQcohE6BEFLvB+7g66i5Rz8vLOHLmW8NP6J1Y8cTxm9doqDKoCkEz4G g==; X-IronPort-AV: E=McAfee;i="6400,9594,10431"; a="273440385" X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="273440385" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2022 14:23:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="730332995" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 06 Aug 2022 14:23:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 948AAF7; Sun, 7 Aug 2022 00:23:35 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6n?= =?utf-8?q?ig?= Subject: [PATCH v1 1/4] pwm: sysfs: Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Date: Sun, 7 Aug 2022 00:23:28 +0300 Message-Id: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Using these newer macros allows the compiler to remove the unused structure and functions when !CONFIG_PM_SLEEP + removes the need to mark pm functions __maybe_unused. Signed-off-by: Andy Shevchenko Reviewed-by: Uwe Kleine-König --- drivers/pwm/sysfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index 9903c3a7eced..c21b6046067b 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -433,7 +433,7 @@ static int pwm_class_resume_npwm(struct device *parent, unsigned int npwm) return ret; } -static int __maybe_unused pwm_class_suspend(struct device *parent) +static int pwm_class_suspend(struct device *parent) { struct pwm_chip *chip = dev_get_drvdata(parent); unsigned int i; @@ -464,20 +464,20 @@ static int __maybe_unused pwm_class_suspend(struct device *parent) return ret; } -static int __maybe_unused pwm_class_resume(struct device *parent) +static int pwm_class_resume(struct device *parent) { struct pwm_chip *chip = dev_get_drvdata(parent); return pwm_class_resume_npwm(parent, chip->npwm); } -static SIMPLE_DEV_PM_OPS(pwm_class_pm_ops, pwm_class_suspend, pwm_class_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(pwm_class_pm_ops, pwm_class_suspend, pwm_class_resume); static struct class pwm_class = { .name = "pwm", .owner = THIS_MODULE, .dev_groups = pwm_chip_groups, - .pm = &pwm_class_pm_ops, + .pm = pm_sleep_ptr(&pwm_class_pm_ops), }; static int pwmchip_sysfs_match(struct device *parent, const void *data) From patchwork Sat Aug 6 21:23:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1664276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=IXeUEGn9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4M0b6y6XCLz9sCD for ; Sun, 7 Aug 2022 07:23:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233763AbiHFVXc (ORCPT ); Sat, 6 Aug 2022 17:23:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233672AbiHFVXa (ORCPT ); Sat, 6 Aug 2022 17:23:30 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EDA7F593; Sat, 6 Aug 2022 14:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659821007; x=1691357007; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B9uL+ecQZ0NAOtCcVBdGiNsDhlGKvi4c2/vcVVL4eBU=; b=IXeUEGn9lD+N93qv5GNEq3TlSg8huf4PMJ/fj9KkBPLhDyTZlSB8Ny8z 4dC2B37GOZ49l80mmpOyS893RtPERVVh7KC8BU1iMW7bNSmugoCfk8ZLr adyB1FLFe+/HDC/7QsCwnQWU+TTH5gFGM+hLv3eJbnGW3r8sZOTbBk9V7 Z8oN3v65XNCqoGFQHyHuXG3TO8HGZD27f8nZxR6C1E4Kn3qxthVrqgdN2 KPyoDdiVadFHoIZObxR2vOzgxP/xL0yaSAvCXup/cqpUZMvIgyZEAW/Uf JKKLEqmJ0PDjzsLmv74Sa/xgMXr1Pk2zI3qmfSSiK00CSmyrqpAomVPfW g==; X-IronPort-AV: E=McAfee;i="6400,9594,10431"; a="270166039" X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="270166039" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2022 14:23:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="636859733" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 06 Aug 2022 14:23:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8E0ED1AA; Sun, 7 Aug 2022 00:23:36 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6n?= =?utf-8?q?ig?= Subject: [PATCH v1 2/4] pwm: sysfs: Return directly from the for-loop in PM callbacks Date: Sun, 7 Aug 2022 00:23:29 +0300 Message-Id: <20220806212331.40086-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> References: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org There is no need to assign ret to 0 and then break the loop just for returning the error to the caller. Instead, return directly from the for-loop, and 0 otherwise. Signed-off-by: Andy Shevchenko Acked-by: Uwe Kleine-König --- drivers/pwm/sysfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index c21b6046067b..1543fe07765b 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -413,7 +413,7 @@ static int pwm_class_resume_npwm(struct device *parent, unsigned int npwm) { struct pwm_chip *chip = dev_get_drvdata(parent); unsigned int i; - int ret = 0; + int ret; for (i = 0; i < npwm; i++) { struct pwm_device *pwm = &chip->pwms[i]; @@ -427,17 +427,17 @@ static int pwm_class_resume_npwm(struct device *parent, unsigned int npwm) state.enabled = export->suspend.enabled; ret = pwm_class_apply_state(export, pwm, &state); if (ret < 0) - break; + return ret; } - return ret; + return 0; } static int pwm_class_suspend(struct device *parent) { struct pwm_chip *chip = dev_get_drvdata(parent); unsigned int i; - int ret = 0; + int ret; for (i = 0; i < chip->npwm; i++) { struct pwm_device *pwm = &chip->pwms[i]; @@ -457,11 +457,11 @@ static int pwm_class_suspend(struct device *parent) * this suspend function. */ pwm_class_resume_npwm(parent, i); - break; + return ret; } } - return ret; + return 0; } static int pwm_class_resume(struct device *parent) From patchwork Sat Aug 6 21:23:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1664274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=CYkH/x1P; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4M0b6w4gh8z9s5W for ; Sun, 7 Aug 2022 07:23:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233688AbiHFVXb (ORCPT ); Sat, 6 Aug 2022 17:23:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233451AbiHFVXa (ORCPT ); Sat, 6 Aug 2022 17:23:30 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E309AF59A; Sat, 6 Aug 2022 14:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659821007; x=1691357007; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v+i54djYfnoUzIKie9dv1CNcKoQgAuSTdid5qaQpsnk=; b=CYkH/x1P84Z/K5zyRFNAv8bcvumdKeZ1BOdb8bg7iP6jU0P7pzXobPF3 hKnwiHS6dAdNgb00FWxA9CSp0aIYv0UHEA0YDjeCWDyX9qfjj3iX+zEch kIltOIxH9pE7adgqVh2H33MlDIy3YTUECP0qBYqgCfW/X+ZNxdlacYXGl f0pq5E2sklNhOqE4EOiEc2Mq80jvTo7JTVkOXYH6Yrlk4u4nthObbcAod groRIITSPR7yJPRtsVeerBGovq7lkaySKij+XXKGqC3//HD/fcuufC+Jb IzIlD+Oqg9QbsU6gJnvZZwedbKJFLr/l++HzISNCK6TI+jLe0an6DlPV3 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10431"; a="352116771" X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="352116771" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2022 14:23:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="746212463" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 06 Aug 2022 14:23:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4C2E91D0; Sun, 7 Aug 2022 00:23:37 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6n?= =?utf-8?q?ig?= Subject: [PATCH v1 3/4] pwm: sysfs: Replace sprintf() with sysfs_emit() Date: Sun, 7 Aug 2022 00:23:30 +0300 Message-Id: <20220806212331.40086-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> References: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org For sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces such a sprintf() call straightforwardly with the new helper. Signed-off-by: Andy Shevchenko Reviewed-by: Uwe Kleine-König --- drivers/pwm/sysfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index 1543fe07765b..767c4b19afb1 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -42,7 +42,7 @@ static ssize_t period_show(struct device *child, pwm_get_state(pwm, &state); - return sprintf(buf, "%llu\n", state.period); + return sysfs_emit(buf, "%llu\n", state.period); } static ssize_t period_store(struct device *child, @@ -77,7 +77,7 @@ static ssize_t duty_cycle_show(struct device *child, pwm_get_state(pwm, &state); - return sprintf(buf, "%llu\n", state.duty_cycle); + return sysfs_emit(buf, "%llu\n", state.duty_cycle); } static ssize_t duty_cycle_store(struct device *child, @@ -112,7 +112,7 @@ static ssize_t enable_show(struct device *child, pwm_get_state(pwm, &state); - return sprintf(buf, "%d\n", state.enabled); + return sysfs_emit(buf, "%d\n", state.enabled); } static ssize_t enable_store(struct device *child, @@ -171,7 +171,7 @@ static ssize_t polarity_show(struct device *child, break; } - return sprintf(buf, "%s\n", polarity); + return sysfs_emit(buf, "%s\n", polarity); } static ssize_t polarity_store(struct device *child, @@ -212,7 +212,7 @@ static ssize_t capture_show(struct device *child, if (ret) return ret; - return sprintf(buf, "%u %u\n", result.period, result.duty_cycle); + return sysfs_emit(buf, "%u %u\n", result.period, result.duty_cycle); } static DEVICE_ATTR_RW(period); @@ -361,7 +361,7 @@ static ssize_t npwm_show(struct device *parent, struct device_attribute *attr, { const struct pwm_chip *chip = dev_get_drvdata(parent); - return sprintf(buf, "%u\n", chip->npwm); + return sysfs_emit(buf, "%u\n", chip->npwm); } static DEVICE_ATTR_RO(npwm); From patchwork Sat Aug 6 21:23:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1664277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=ObA13w7B; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4M0b6z2kBRz9s5W for ; Sun, 7 Aug 2022 07:23:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233802AbiHFVXd (ORCPT ); Sat, 6 Aug 2022 17:23:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233680AbiHFVXb (ORCPT ); Sat, 6 Aug 2022 17:23:31 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38E4EF59C; Sat, 6 Aug 2022 14:23:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659821008; x=1691357008; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y/ekvDK9lfRgpxrLz1N34iu6xjYZHHBgk3QqU8GADcA=; b=ObA13w7BRjtU4X86UJXmupe7mhxn7zjm6v2ev7zJyHcDQ1DQ1cj+rGAA BmMP64NLkhFlo5AwaVk3CGgxziP3nGcvVVg2iFp+xudYdH95mKuUCCLIv ioXTIf/l28MqWWGfRngTL+mi5VSdk1ypHjjEykWFId9281WRO022QqOn2 XRUSosjqVnqsUgsww76Z5o3KQN0tzeNhwAL2uiiCxOzUmOonhxVl/o2PX ivoROelEemPJE6OONffGX6m00J3jKmUkaRbyqUzJku+EnaXmgpneKUKvM wAMqoaUH51uPbY1JvW2d38Bw0kquKAIKqfx/CSyKEs2n6y024qEeEMfxt g==; X-IronPort-AV: E=McAfee;i="6400,9594,10431"; a="290400604" X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="290400604" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2022 14:23:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,217,1654585200"; d="scan'208";a="663426672" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 06 Aug 2022 14:23:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 12665347; Sun, 7 Aug 2022 00:23:38 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6n?= =?utf-8?q?ig?= Subject: [PATCH v1 4/4] pwm: sysfs: Utilize an array for polarity strings Date: Sun, 7 Aug 2022 00:23:31 +0300 Message-Id: <20220806212331.40086-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> References: <20220806212331.40086-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Code is smaller and looks nicer if we combine polarity strings into an array. Signed-off-by: Andy Shevchenko --- drivers/pwm/sysfs.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index 767c4b19afb1..1bbc5286b7c6 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -151,27 +151,23 @@ static ssize_t enable_store(struct device *child, return ret ? : size; } +static const char * const polarity_strings[] = { + [PWM_POLARITY_NORMAL] = "normal", + [PWM_POLARITY_INVERSED] = "inversed", +}; + static ssize_t polarity_show(struct device *child, struct device_attribute *attr, char *buf) { const struct pwm_device *pwm = child_to_pwm_device(child); - const char *polarity = "unknown"; struct pwm_state state; pwm_get_state(pwm, &state); + if (state.polarity < 0 || state.polarity >= ARRAY_SIZE(polarity_strings)) + return sysfs_emit(buf, "unknown\n"); - switch (state.polarity) { - case PWM_POLARITY_NORMAL: - polarity = "normal"; - break; - - case PWM_POLARITY_INVERSED: - polarity = "inversed"; - break; - } - - return sysfs_emit(buf, "%s\n", polarity); + return sysfs_emit(buf, "%s\n", polarity_strings[state.polarity]); } static ssize_t polarity_store(struct device *child, @@ -180,20 +176,16 @@ static ssize_t polarity_store(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); struct pwm_device *pwm = export->pwm; - enum pwm_polarity polarity; struct pwm_state state; int ret; - if (sysfs_streq(buf, "normal")) - polarity = PWM_POLARITY_NORMAL; - else if (sysfs_streq(buf, "inversed")) - polarity = PWM_POLARITY_INVERSED; - else - return -EINVAL; + ret = sysfs_match_string(polarity_strings, buf); + if (ret < 0) + return ret; mutex_lock(&export->lock); pwm_get_state(pwm, &state); - state.polarity = polarity; + state.polarity = ret; ret = pwm_apply_state(pwm, &state); mutex_unlock(&export->lock);