From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161160AbdDUMpZ (ORCPT ); Fri, 21 Apr 2017 08:45:25 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:56117 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756637AbdDUMpW (ORCPT ); Fri, 21 Apr 2017 08:45:22 -0400 From: Arnd Bergmann To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, Arnd Bergmann , Boris Brezillon , Mike Turquette , linux-kernel@vger.kernel.org Subject: [stable 3.18 PATCH] clk: at91: usb: fix determine_rate prototype again Date: Fri, 21 Apr 2017 14:45:23 +0200 Message-Id: <20170421124528.2644028-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:OMlk7mpwfXQs3wpbcm7lQq7MF55galZ2GuoOCKZjQ8krWCevH4u zf7Cws0x/vE1exmAzznifLECA79/jWLNwSvZuE5dlMUmvNTWBpLvOveGZkIqPg2n7VfLllK IZ/MRzXprQ7wAye5KQeNt+z6RQaLG/M3PHZt/yBfK/MRtzbjVplSIQfHDWA4aUOQA77hDen 77wBUFbspDzvM6hb0uYRg== X-UI-Out-Filterresults: notjunk:1;V01:K0:UKPiQWftIA8=:lrZSwj7UEdchLi3v0OYSlJ 6ZJNol6MsOz5yI/RYTSvCp4Uox5KfCM7XK75vHXvAj3g1ZYYFSEHkYRzO/L/MAjD03Hxq8ZVF HLjGbW/l/HiGP5e3zqM41nz5qRqz8dXCDovtrPgvefUkRdWlp4EcXuD/kC8F05wNITqNUv0Oh 5GHwLds5BDFsKvovC6K3PdIStH0b04oVLKKY5+XXGeE6yPD6Mt4HTSGIARLag0DtHfjhuxWqW 6fn5tZrbD6Ex9K0HkhmzdJUgF+e4a3EbcGFwBlsoGeA90dGTSJtD6QUwiK4ttLmYDrafBI6vS bwWyopMOKMPr53GnHsDbq9gjf6baqPhzfDZmjbXl8EgbfXwHnatt6WSNPOCn6aNec5agy1p7a 0IRyu1YIV02ppRGO/tBG3xhZ60GL6/ROCjl/eGoM75pVUybRhkT9UZEk2vRGB5mimfwhMd64Q sN+Fdf5z54Y/3oSkhaRO6EgUcRw5gTThw3wX1vefDhdOxEz3+0dnIMySkOXrw7jpiz5+kMy2n CN3ioTNOEPLsoYe/ahc/9XI1I1vXN3YjgsC9eTQ4O/R36zxmkKj2HKQI0XknM4jgGNsWowZm1 nbAG6F+5SJjZxtptTW4/Ohv9bdvwwd1BhUZvOlpfaJDNEIj7dJqR5X54eNg8YObX54Iu55Igt v6uW1qF4P73ndV8yaJ5yxKVDtmboxFZ4Ez17B3ypEqOz9IWYy/fIdzT0c37xdiTZP2ks= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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) -- 2.9.0