From patchwork Sat Dec 30 01:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 10137581 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 D791A6037D for ; Sat, 30 Dec 2017 01:19:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA7222B551 for ; Sat, 30 Dec 2017 01:19:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF5AC2B55D; Sat, 30 Dec 2017 01:19:25 +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 45CE22B551 for ; Sat, 30 Dec 2017 01:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbdL3BTY (ORCPT ); Fri, 29 Dec 2017 20:19:24 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:43743 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986AbdL3BNW (ORCPT ); Fri, 29 Dec 2017 20:13:22 -0500 Received: by mail-wm0-f65.google.com with SMTP id n138so50420573wmg.2 for ; Fri, 29 Dec 2017 17:13:21 -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=MZqSKpO1FrQNPVhz8kw1QgVEkBSKcip4At1/KMY8jY2vGfrOh8B9T7dCoNQlPmGdMe yv/ZK3bG0MEhKf+GH/3h0ZGQ5RmsDW2JM0BgIVW1ZT4EtGWg5c8e6ra9SgijboTXeTvG 24LoriAPlwWYJYHTot6ZwyCPjzxcisxZNdIrOExB4fFzdeAINNKPKZSqz4B+uByfQ3rZ 9M8GYW0CdMOnlC2ByOHW5zO/U8lP/oIqgl+mAhZGshGmkYTn+cEfPqt31x7YTnDDB2D2 jwV2nv6BTTL5n4R3fsffufEmUpgHW1xAr1obMwdktvnj9HZqr8Ypjdy3o1+Rjq41Rc/g EJow== 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=tg9CYWHb8vyStSnoVwhBB86TKSkrXyFHr9eScFoeUIaFz1u84+iOV5ueabeoM2cnNJ 5aOSm3EWblh249VI5vuYt60/x7zE9wD+XC9j0F2Noud0VoKQKOn06JBe/wgvcwOY5FHp WNb9KWNqnzJqjILItgVBZS1UmA9RaexpCO1+CE/JyEmrYZbRFxpe3x4uoGpmUrInrWJE KQ0iOCNZyHYUJ7MG3qbctdsinA8fSb7Ry2AqL75p/mJEajgCkDGyE14gG/a4u6T4zTer NNthbJDA4xv8itrfMJeF3sihkX6O483ANBMUm65qJ6AxRKTaYh1VQhT/QWQ8R0kZT5+1 fDIA== X-Gm-Message-State: AKGB3mKo4PYTBFzYdoSH8N83Tul06x/GuBHXLQ/9iq66iNqvANU1xAH7 EnHvzbwmRpr0Qj3aHFXhzaUfRw== X-Google-Smtp-Source: ACJfBovYnftITmHgJmI+JKiAQ1+mXe7mBiYcIcaa2QOiOGJYfiUPWTUMaBpbRnKiQo2nFA9ja/J6Qw== X-Received: by 10.80.240.200 with SMTP id a8mr46590817edm.288.1514596400864; Fri, 29 Dec 2017 17:13:20 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id h4sm29818268edb.16.2017.12.29.17.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Dec 2017 17:13:20 -0800 (PST) From: Bryan O'Donoghue To: mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: pure.logic@nexus-software.ie, 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 08/33] clk: bcm2835: change bcm2835_pll_rate_from_divisors to return unsigned long Date: Sat, 30 Dec 2017 01:12:47 +0000 Message-Id: <1514596392-22270-9-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514596392-22270-1-git-send-email-pure.logic@nexus-software.ie> References: <1514596392-22270-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;