From patchwork Mon Jan 1 19:42:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 10139513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 06EE260362 for ; Mon, 1 Jan 2018 19:49:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC291286FB for ; Mon, 1 Jan 2018 19:49:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0422286FE; Mon, 1 Jan 2018 19:49:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C22C286FB for ; Mon, 1 Jan 2018 19:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868AbeAATnb (ORCPT ); Mon, 1 Jan 2018 14:43:31 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:42934 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753785AbeAATn0 (ORCPT ); Mon, 1 Jan 2018 14:43:26 -0500 Received: by mail-wm0-f65.google.com with SMTP id b141so11704123wme.1 for ; Mon, 01 Jan 2018 11:43:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eHBpISSgqpSUMUXcgSjAisF2NMERdMeJ6Jt8btgSrgo=; b=EHlYdwXZ2+1bQgczLMMNV6zlUCKnZRXx4ENfl6KHAXPlZybZi7LlwamZdeaeyz+TkX Xx6Eq504ZIiV79MKoJeYMY/3NTY6TSQl+UomDA8xXP6ifZ2xE5ju6UFjrM7ZQPNSdQNi TTO0pO5Xc0AwHHiaLPnPk8Sl64QUzznNWeEs9M3TdaU7bbW3fmzgQ4rPEoe3LFCsL3Jt yFQdk23WMShF9UxxoS8ezfG3S9krFlkKmx5tMIns2vY4bQrFfStqMKZEIT9SDL7afe44 7llWDmQ2drNX0ooDGULawEpBToUIM8j9uwzr4dorFLnFaPcrOppwqW3921qFFioxgrCp uvWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eHBpISSgqpSUMUXcgSjAisF2NMERdMeJ6Jt8btgSrgo=; b=Fe75cGfWeOmEWbRwIKV/zxqqziuKz5EyH7afouMobirhei21pWE3vmmQDuFpC2vbk7 dRqGoerUvOptXWn+ujuWZ2PWzYkj9ArKVv2/hxEiYQWz9pqqL6cBTj0cAn854l3hOFwY hmY98BbHSTKa9LYKuwl0xbr6yYoLatlq2cFxVcSSeDlPc9oy3D7qzCjnuqStGbeLnWAY 210JnasYVrayOeL13CwkV2y7uis7qamSYfjLB2ivHRAm0m18fS5ElH7pXelMdd7CkGIp EjswjOB06CHPMShrYy6q2Q8/T4QZ92Hm3vI24asoq/VJo7Dqp2ODIzKLhFQMYGSaTEEh Zv1g== X-Gm-Message-State: AKGB3mIhLBBg8iiPY1LYxEQxQWzc4YRuIkzJWv4Hjnzvl79RVQO29E+a s6UehdDHpWVHEQGadTZtWi4Urg== X-Google-Smtp-Source: ACJfBoumm9P/l43X7uZkK0DU6ehRYuk6Zoxofn5zq7BKWPVcOB0w3Ipso6LVQYuxSLiZ95mYx9ujXA== X-Received: by 10.80.240.17 with SMTP id r17mr57676227edl.57.1514835804917; Mon, 01 Jan 2018 11:43:24 -0800 (PST) Received: from localhost.localdomain (D4CCACC7.cm-2.dynamic.ziggo.nl. [212.204.172.199]) by smtp.gmail.com with ESMTPSA id w2sm39361075edb.4.2018.01.01.11.43.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jan 2018 11:43:24 -0800 (PST) From: Bryan O'Donoghue To: mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Bryan O'Donoghue , Eric Anholt , Stefan Wahren , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Boris Brezillon , Phil Elwell , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 08/34] clk: bcm2835: change bcm2835_pll_rate_from_divisors to return unsigned long Date: Mon, 1 Jan 2018 19:42:47 +0000 Message-Id: <1514835793-1104-9-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514835793-1104-1-git-send-email-pure.logic@nexus-software.ie> References: <1514835793-1104-1-git-send-email-pure.logic@nexus-software.ie> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP bcm2835_pll_rate_from_divisors() returns a value directly as the return value to round_rate(). clk_ops->round_rate() has been changed to an unsigned long so for the sake of completeness and neatness this patch updates the helper function to return the same data-type. Signed-off-by: Bryan O'Donoghue Cc: Michael Turquette Cc: Stephen Boyd Cc: Eric Anholt Cc: Stefan Wahren Cc: Florian Fainelli Cc: Ray Jui Cc: Scott Branden Cc: bcm-kernel-feedback-list@broadcom.com Cc: Boris Brezillon Cc: Phil Elwell Cc: linux-clk@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/clk/bcm/clk-bcm2835.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index c215dc9..fb2b012 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -541,8 +541,9 @@ static void bcm2835_pll_choose_ndiv_and_fdiv(unsigned long rate, *fdiv = div & ((1 << A2W_PLL_FRAC_BITS) - 1); } -static long bcm2835_pll_rate_from_divisors(unsigned long parent_rate, - u32 ndiv, u32 fdiv, u32 pdiv) +static unsigned long bcm2835_pll_rate_from_divisors(unsigned long parent_rate, + u32 ndiv, u32 fdiv, + u32 pdiv) { u64 rate;