From patchwork Wed Mar 2 15:32:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 591016 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 1C438140B0E for ; Thu, 3 Mar 2016 02:35:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=H859G0xv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755404AbcCBPfk (ORCPT ); Wed, 2 Mar 2016 10:35:40 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36760 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755050AbcCBPe0 (ORCPT ); Wed, 2 Mar 2016 10:34:26 -0500 Received: by mail-wm0-f44.google.com with SMTP id n186so91569845wmn.1 for ; Wed, 02 Mar 2016 07:34:25 -0800 (PST) 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=OYQXdlNFNaiLpWCR7RC7Qrcpnky0BCRFEYOE+7ukRrI=; b=H859G0xvQbMFF0MKcUaTIDyngpXmxzphviB53Mk8Os0q9ieXyZmk4CsB5zjx4RbyuS oqgD1zkj3uJbTiLwjiZ/whB92drLJZto5p6zjizU0UJsD4JcpF49BgiRhMH4zxWA1obB /WM+KNN6lHvZtrCBFGNrbZuq29Qe1OUROSll8= 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=OYQXdlNFNaiLpWCR7RC7Qrcpnky0BCRFEYOE+7ukRrI=; b=XrnbRgxcgI1CM46MPsjv6AHgPnrMWjx+63T4WbFCTsw+/LJA2EqRRX9pfcRwSr65qT Ok0bZWcubkye2rND1eqm9Ia1wqX5LCTg3glX9rj1XX1FedwuNa/vFz9Kh8iQh8InWpKK qgP6Rg08iFqEM/g1UIdhgGR7vdi/FG7senTfG9BWXbbNoXnEEWtcLsafXB+KhSfjk4ad AqifE5YwYEJj6mD+8xICiZVdK3pcgBXh0GlO9OV1xbZ7GP06NhsHLPw5bkLlJFSXsVbG EXPm/zUJmPCqLqWhLBv2DDC4exbtYn1RcWkarcfWvp0Gvd+EbXNHDUjCgC8+phcORfKr Fgvw== X-Gm-Message-State: AD7BkJLH3B+x1pdUPKtfTCsDrTQSg/qz9Aag6IhXZXnBs9XWl6iB4hjcXypBqoEAJQpJ+G40 X-Received: by 10.28.144.19 with SMTP id s19mr492541wmd.81.1456932865147; Wed, 02 Mar 2016 07:34:25 -0800 (PST) Received: from localhost.localdomain (host81-154-142-245.range81-154.btcentralplus.com. [81.154.142.245]) by smtp.gmail.com with ESMTPSA id da6sm26941407wjb.24.2016.03.02.07.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 07:34:24 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com, Lee Jones Subject: [RESEND 11/11] pwm: sti: Take the opportunity to conduct a little house keeping Date: Wed, 2 Mar 2016 15:32:09 +0000 Message-Id: <1456932729-9667-12-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> References: <1456932729-9667-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 | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 93cf20e..93e3abf 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -144,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; @@ -166,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; @@ -212,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; @@ -506,7 +506,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,10 +570,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_chan = 1; + + cdata->reg_fields = &sti_pwm_regfields[0]; + cdata->max_prescale = 0xff; + cdata->max_pwm_cnt = 255; + cdata->pwm_num_chan = 1; cdata->cpt_num_chan = 0; pc->cdata = cdata;