Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424932AbdD1IjB (ORCPT ); Fri, 28 Apr 2017 04:39:01 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56058 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939669AbdD1If1 (ORCPT ); Fri, 28 Apr 2017 04:35:27 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Boris Brezillon , Arnd Bergmann Subject: [PATCH 3.18 17/47] clk: at91: usb: fix determine_rate prototype again Date: Fri, 28 Apr 2017 10:32:30 +0200 Message-Id: <20170428083039.073884215@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170428083038.327543269@linuxfoundation.org> References: <20170428083038.327543269@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1613 Lines: 47 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann We had an incorrect backport of 4591243102fa ("clk: at91: usb: propagate rate modification to the parent clk") that was fixed incorrectly in linux-3.18.y by 76723e7ed589 ("clk: at91: usb: fix determine_rate prototype") as shown by this warning: drivers/clk/at91/clk-usb.c:155:20: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] drivers/clk/at91/clk-usb.c:193:20: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] This should fix it properly. Acked-by: Boris Brezillon Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/clk/at91/clk-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_ static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, unsigned long rate, unsigned long *best_parent_rate, - struct clk_hw **best_parent_hw) + struct clk **best_parent_hw) { struct clk *parent = NULL; long best_rate = -EINVAL; @@ -91,7 +91,7 @@ static long at91sam9x5_clk_usb_determine best_rate = tmp_rate; best_diff = tmp_diff; *best_parent_rate = tmp_parent_rate; - *best_parent_hw = __clk_get_hw(parent); + *best_parent_hw = parent; } if (!best_diff || tmp_rate < rate)