From patchwork Fri Aug 26 17:07:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1670944 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=HhKLE6/s; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MDmTs1kT9z1yhT for ; Sat, 27 Aug 2022 03:07:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233141AbiHZRHJ (ORCPT ); Fri, 26 Aug 2022 13:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbiHZRHI (ORCPT ); Fri, 26 Aug 2022 13:07:08 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38B6BCD50C; Fri, 26 Aug 2022 10:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661533627; x=1693069627; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ilscLTpKs/IqV0qkRKvz7LoihcjNqeU+V/R/IHV5unc=; b=HhKLE6/smRztAFKxUOckzckgrCFUl/5SGQ5hwKr5hHR1buaf+MDVOuP/ g3p5ZhTTKlnHPhegteTtliABB/asKjphFrq71OKUz8mld5jZZ+EJy83G/ tCm5ZO69R55myaNpVSQ/lEHGWsNF0KBvR8Q6RxPwTH0PXEpjbVplgE8Gs rZJNNRbwXwYrsrlvSVRJMcpXPmTyOOX+CudC2eSAKkwkpG1/U/Fwuh6h5 5H9NaoeCpHI5oi40BWEGqEcl6BuG4973TDgqYV1auCHIqVUWw8FPHexML eIibN7vILHjzXnb6dp8C4rnXWE3753U+OuIlrFdW4+7VHezivTPGN9KwX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="274304602" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="274304602" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 10:07:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="938821066" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 26 Aug 2022 10:07:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EA3E719D; Fri, 26 Aug 2022 20:07:19 +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 v2 1/4] pwm: sysfs: Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Date: Fri, 26 Aug 2022 20:07:13 +0300 Message-Id: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 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 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 --- v2: added tag (Uwe) 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 Fri Aug 26 17:07:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1670947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=acxhi9j/; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MDmTw4RRNz1yhT for ; Sat, 27 Aug 2022 03:07:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244804AbiHZRHP (ORCPT ); Fri, 26 Aug 2022 13:07:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243995AbiHZRHN (ORCPT ); Fri, 26 Aug 2022 13:07:13 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E60E6CCD73; Fri, 26 Aug 2022 10:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661533632; x=1693069632; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wHbno+9bH5FlaHl2aCUA9a9noFNnMz8wJkNpCpcnCGc=; b=acxhi9j/FcgeWG+zUF+dUQtki3isCOWyEyQNIFRRwWPrt7a7ijDamkSt Bo0rMhJKha1F2yguYrU48yu6RgUptsZ49+727OlmtjmhJgtlnW0b0bfMF 07Nrw0qi0CsNiNM1OUHndZlrA7jFHYMxs56fqKILMGUTWAnmSvTYlRzlQ I4CJbMGoY9ytgwm/9YkbwPeebGZpNRJ2+SdxmHDQRhH2h+FnbWgRQLC+A 0pD8Ek+7Z6rdZujizi2MWKaokZuqRWDxB/rnRipyr8BrtPS5Jc2+MgycX NJ8dUtDpGalnovMvtPmwM1OixtWiiWiBCm/Rwvnugz96WPadckjRzwbdg w==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="295825585" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="295825585" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 10:07:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="640131972" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 26 Aug 2022 10:07:07 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5D85E1C3; Fri, 26 Aug 2022 20:07:21 +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 v2 2/4] pwm: sysfs: Return directly from the for-loop in PM callbacks Date: Fri, 26 Aug 2022 20:07:14 +0300 Message-Id: <20220826170716.6886-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> References: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 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 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 --- v2: added tag (Uwe) 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 Fri Aug 26 17:07:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1670945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=IC1CN3eg; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MDmTt01Gzz1yhc for ; Sat, 27 Aug 2022 03:07:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239224AbiHZRHM (ORCPT ); Fri, 26 Aug 2022 13:07:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234371AbiHZRHK (ORCPT ); Fri, 26 Aug 2022 13:07:10 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBA32CCE12; Fri, 26 Aug 2022 10:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661533629; x=1693069629; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FlBUFOqO3yeVg/iVFi+5/Sl0JuIYKzTkoENlpUb/36E=; b=IC1CN3egg1l+q9m3/6lvrikoWwvsQlrJIwi1Sn9qLXrUUqQ/hTEcRutS KGmcrZLl91GY17GPdJ4NK/J0LUuPPwry+WL3PHK5KwY5uxauufNsaKIpJ m3GgF4RXp5jprZFcZgZXrvOWB68pp3vlr1YVzsO9bA9gwvaoVTCf+F9fp Y9R+Bjo8e7JvHr1EGogJUC5Le7TAfeBS28DeM85QoTicxmfGHCp/Stwnp F8VBMJFnyJQ6gPS26NdDNGOVSzCU7kuj1zlhL7ggNhi7tjlsQphgB5hTm Efkkc+z7c0alDwtQIJRx858w0XZiFtnt0ITwJm+IgZg+BuB1N1lCdqT+9 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="274953714" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="274953714" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 10:07:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="606822061" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 26 Aug 2022 10:07:07 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 04AF3238; Fri, 26 Aug 2022 20:07:21 +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 v2 3/4] pwm: sysfs: Replace sprintf() with sysfs_emit() Date: Fri, 26 Aug 2022 20:07:15 +0300 Message-Id: <20220826170716.6886-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> References: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 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 --- v2: added tag (Uwe) 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 Fri Aug 26 17:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1670946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=Gvl/FQ4x; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MDmTt3PXvz1yhT for ; Sat, 27 Aug 2022 03:07:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231447AbiHZRHN (ORCPT ); Fri, 26 Aug 2022 13:07:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233300AbiHZRHL (ORCPT ); Fri, 26 Aug 2022 13:07:11 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11B9ACCD73; Fri, 26 Aug 2022 10:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661533631; x=1693069631; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XAme111dOCB0Z2pzDjE7oI0QWdXeQ1KXWJkSS2PlD+E=; b=Gvl/FQ4xlLAkM74iaZjk+26ZbHmfBFWZknJdiNhqHZt0D5lL+lz30NX0 rKWiFE4BjRDX5ebgyNju22qTqIYHoz+ui92x0lCi2PEhcjnO4AXbh7Cz6 3dnGuBfYModOKTotYvYsXdoUDGpJxV/uZuSMGg1+hU0ENu0EPNGssy9SC nZLWyC62nasyvAU4wt2VZsNXtRAo7OAtMF0AMDNZKNmFGpTLP/gL2Hz4N XUr4+6/8blCYr2xAH7xgoRIiTZa/SDnTtyKJvwu8+hGzg7YD7m2KERfxS zLe7qpcmu6ae7vpv8/y4L9SU1P9aokXa1WVQD/6OeKAo2QgEVNuR0klYn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="356267443" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="356267443" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 10:07:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="736689377" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 26 Aug 2022 10:07:09 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 698FA19D; Fri, 26 Aug 2022 20:07:23 +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 v2 4/4] pwm: sysfs: Utilize an array for polarity strings Date: Fri, 26 Aug 2022 20:07:16 +0300 Message-Id: <20220826170716.6886-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> References: <20220826170716.6886-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 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 Code is smaller and looks nicer if we combine polarity strings into an array. Signed-off-by: Andy Shevchenko --- v2: added pwm_ prefix to the variable (Uwe), adjusted intendation (Uwe) 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..502167e44a3d 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 pwm_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(pwm_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", pwm_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(pwm_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);