From patchwork Fri Apr 22 10:18:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 613498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qrs6r0CMWz9t4b for ; Fri, 22 Apr 2016 20:19:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=SLkfFGg7; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752678AbcDVKSf (ORCPT ); Fri, 22 Apr 2016 06:18:35 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38333 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752677AbcDVKSd (ORCPT ); Fri, 22 Apr 2016 06:18:33 -0400 Received: by mail-wm0-f53.google.com with SMTP id u206so19372665wme.1 for ; Fri, 22 Apr 2016 03:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eBzsIVT4n2oVi/EYjdI7ridEK4adeomzMMFtqB+bipU=; b=SLkfFGg7XSPRL9FsvGYnQm9Zlm+KIbm4bJ2/bc1VxS2zkc0oJWYu7NtudZa/Jr37ax y0RJpwIou81adfJXtlyo1YZ4lmcsllCUl2jFfSiY1ZllziQZJAlQN3VAlDomVcMSfXjB 1sEDL5qNXMWt9MwqXMZvrYrjeyvc3VGKKnCkA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eBzsIVT4n2oVi/EYjdI7ridEK4adeomzMMFtqB+bipU=; b=Ikh3c0KjJeaQxuPKZKEEfTEOB6mWPXOWGHuQ1DyAOZyT4Cc63Dw/Uku0VG0Cc1/o7N 4uhfTLQ0omJYYmLqqeDP3cJN90DY+HD5v3yy6q7goAlrLPspgQvh6OPHfG3rHJqy4QQv 7bxEL8UPmsd0lqoUshu/EHsX842x4XllQ4GNduSQDGA6JIu4SU89cwWGnHmQwVUeOA+i 7pVHDGZG3Eks/8Y7SeTyBtRoiEpCcVsfxNUk/u7If807z2l4tJZ0OzZlVJGLcnz0qJxP UAPQ+c3oknFD6TBKSbMculgxz+uEfjX9cNFuxYfNqlrFi/KNDxKyEFwgmAV6YbSAe6ym m66Q== X-Gm-Message-State: AOPr4FVMozQWuoIVYOxKjO885Vf+9b3mNaBXjmrmN0dJlCdSCGylylTKNegYKD6m0a0KJkwG X-Received: by 10.194.122.199 with SMTP id lu7mr3249835wjb.40.1461320311634; Fri, 22 Apr 2016 03:18:31 -0700 (PDT) Received: from dell.localdomain (host81-129-172-5.range81-129.btcentralplus.com. [81.129.172.5]) by smtp.gmail.com with ESMTPSA id a1sm7316345wje.43.2016.04.22.03.18.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 03:18:30 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, linux-pwm@vger.kernel.org, thierry.reding@gmail.com, ajitpal.singh@st.com, Lee Jones Subject: [[PATCH v2] 11/11] pwm: sti: Take the opportunity to conduct a little house keeping Date: Fri, 22 Apr 2016 11:18:15 +0100 Message-Id: <1461320295-20414-12-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1461320295-20414-1-git-send-email-lee.jones@linaro.org> References: <1461320295-20414-1-git-send-email-lee.jones@linaro.org> Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org This includes fixing some Coding Style issues and re-ordering/ simplifying a little code. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index cecb6d4..ac37973 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -1,8 +1,10 @@ /* - * PWM device driver for ST SoCs. - * Author: Ajit Pal Singh + * PWM device driver for ST SoCs + * + * Copyright (C) 2013-2016 STMicroelectronics (R&D) Limited * - * Copyright (C) 2013-2014 STMicroelectronics (R&D) Limited + * Author: Ajit Pal Singh + * Lee Jones * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -142,13 +144,13 @@ static int sti_pwm_get_prescale(struct sti_pwm_chip *pc, unsigned long period, val = NSEC_PER_SEC / clk_rate; val *= cdata->max_pwm_cnt + 1; - if (period % val) { + if (period % val) return -EINVAL; - } else { - ps = period / val - 1; - if (ps > cdata->max_prescale) - return -EINVAL; - } + + ps = period / val - 1; + if (ps > cdata->max_prescale) + return -EINVAL; + *prescale = ps; return 0; @@ -164,7 +166,7 @@ static int sti_pwm_get_prescale(struct sti_pwm_chip *pc, unsigned long period, * 256 values. */ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, - int duty_ns, int period_ns) + int duty_ns, int period_ns) { struct sti_pwm_chip *pc = to_sti_pwmchip(chip); struct sti_pwm_compat_data *cdata = pc->cdata; @@ -210,7 +212,7 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, ret = regmap_field_write(pc->prescale_low, - prescale & PWM_PRESCALE_LOW_MASK); + prescale & PWM_PRESCALE_LOW_MASK); if (ret) goto clk_dis; @@ -273,7 +275,7 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) ret = regmap_field_write(pc->pwm_out_en, 1); if (ret) { - dev_err(dev, "failed to enable PWM device:%d\n", + dev_err(dev, "failed to enable PWM device %d\n", pwm->hwpwm); goto out; } @@ -293,10 +295,12 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) mutex_unlock(&pc->sti_pwm_lock); return; } + regmap_field_write(pc->pwm_out_en, 0); clk_disable(pc->pwm_clk); clk_disable(pc->cpt_clk); + mutex_unlock(&pc->sti_pwm_lock); } @@ -507,7 +511,7 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) return PTR_ERR(pc->pwm_cpt_en); pc->pwm_cpt_int_en = devm_regmap_field_alloc(dev, pc->regmap, - reg_fields[PWM_CPT_INT_EN]); + reg_fields[PWM_CPT_INT_EN]); if (IS_ERR(pc->pwm_cpt_int_en)) return PTR_ERR(pc->pwm_cpt_int_en); @@ -570,11 +574,11 @@ static int sti_pwm_probe(struct platform_device *pdev) * Setup PWM data with default values: some values could be replaced * with specific ones provided from Device Tree. */ - cdata->reg_fields = &sti_pwm_regfields[0]; - cdata->max_prescale = 0xff; - cdata->max_pwm_cnt = 255; - cdata->pwm_num_devs = 1; - cdata->cpt_num_devs = 0; + cdata->reg_fields = &sti_pwm_regfields[0]; + cdata->max_prescale = 0xff; + cdata->max_pwm_cnt = 255; + cdata->pwm_num_devs = 1; + cdata->cpt_num_devs = 0; pc->cdata = cdata; pc->dev = dev;