Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1037897AbdDUMxS (ORCPT ); Fri, 21 Apr 2017 08:53:18 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:42913 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035166AbdDUMxQ (ORCPT ); Fri, 21 Apr 2017 08:53:16 -0400 Date: Fri, 21 Apr 2017 14:53:04 +0200 From: Boris Brezillon To: Arnd Bergmann Cc: stable@vger.kernel.org, gregkh@linuxfoundation.org, Mike Turquette , linux-kernel@vger.kernel.org Subject: Re: [stable 3.18 PATCH] clk: at91: usb: fix determine_rate prototype again Message-ID: <20170421145304.06a24b54@bbrezillon> In-Reply-To: <20170421124528.2644028-1-arnd@arndb.de> References: <20170421124528.2644028-1-arnd@arndb.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1835 Lines: 48 On Fri, 21 Apr 2017 14:45:23 +0200 Arnd Bergmann wrote: > 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. > > Cc: Boris Brezillon Acked-by: Boris Brezillon > Signed-off-by: Arnd Bergmann > --- > This should be applied to 3.18.y directly > --- > drivers/clk/at91/clk-usb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c > index 0283a5713d6c..930a424cc4a0 100644 > --- a/drivers/clk/at91/clk-usb.c > +++ b/drivers/clk/at91/clk-usb.c > @@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, > 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_rate(struct clk_hw *hw, > 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)