From patchwork Wed Feb 10 13:02:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 61652 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2630569lbl; Wed, 10 Feb 2016 05:05:48 -0800 (PST) X-Received: by 10.98.0.194 with SMTP id 185mr20686855pfa.139.1455109548720; Wed, 10 Feb 2016 05:05:48 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c8si5055910pat.62.2016.02.10.05.05.48; Wed, 10 Feb 2016 05:05:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751680AbcBJNFr (ORCPT + 30 others); Wed, 10 Feb 2016 08:05:47 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:33918 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751497AbcBJNEr (ORCPT ); Wed, 10 Feb 2016 08:04:47 -0500 Received: by mail-wm0-f54.google.com with SMTP id 128so25915615wmz.1 for ; Wed, 10 Feb 2016 05:04:46 -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=K4udAWd1nq795hgy2a+3rEOwtvMf/WlatE/NXbepMThi92zycg5sQ7ZtMO/kFPq5oz CsMT7IWfXLfu9g7aZ9ljkFO4nCzE47nYQE2RGreWyKhK/CiZol0WjkCJZ5tPDmsLFcvu KixQvebzU7hvf47YIulmxGVFzGbe9P9RH+Ku0= 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=CBt4vEI116V0DY4I4LkUMByw1MVLw2j85W4LAxO8tPaL3yxlFAf3xIgOwNSEUfhXun yAiPUOMiW1mGG4nwUqY+onTush84edWiWqtpSnwB/atuXnyD0EZMWGGuryxvcFpVK6RA 6oyWLCVw50Y4OMGmzoPx1DTOBuMmltfuQGNBS4qRSoMRqGFzF76O8hQa/rnsehd5ud6q OK/2BUz2yi5J+h+ramRbIO4izN+TUWZzMqy/6HG8QEwfVH1hju7CxRfo4EMmS3ml8oQZ sQEQDVnAB3PSwYv97Av8/+PcRqZymZOtamL1V17KpsltQynmTDY82F2TwVoXTtQxb/VW 2QuA== X-Gm-Message-State: AG10YOQu51eASDECOPUbPKTPZZagyeiXpk+HIDaXubI4BWgxjOAoeJe1kRfD/OCw01VHIq5a X-Received: by 10.194.52.72 with SMTP id r8mr39175470wjo.148.1455109486319; Wed, 10 Feb 2016 05:04:46 -0800 (PST) Received: from localhost.localdomain (host81-129-170-149.range81-129.btcentralplus.com. [81.129.170.149]) by smtp.gmail.com with ESMTPSA id q75sm22429319wmd.6.2016.02.10.05.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 05:04:45 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com Cc: kernel@stlinux.com, maxime.coquelin@st.com, Lee Jones Subject: [PATCH 11/11] pwm: sti: Take the opportunity to conduct a little house keeping Date: Wed, 10 Feb 2016 13:02:28 +0000 Message-Id: <1455109348-32767-12-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> References: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 1.9.1 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;