From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Ball Subject: Re: [PATCH] mmc: sirf: fix sdhci_pltfm_init sequence Date: Thu, 27 Jun 2013 11:18:56 -0400 Message-ID: <87ppv7ponz.fsf@octavius.laptop.org> References: <24753444.e6CjWoyOih@wuerfel> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from void.printf.net ([89.145.121.20]:52621 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408Ab3F0PTF (ORCPT ); Thu, 27 Jun 2013 11:19:05 -0400 In-Reply-To: <24753444.e6CjWoyOih@wuerfel> (Arnd Bergmann's message of "Tue, 04 Jun 2013 00:02:13 +0200") Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Arnd Bergmann Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Christian Daudt , Barry Song Hi Arnd, On Mon, Jun 03 2013, Arnd Bergmann wrote: > Patch "mmc: sdhci: Add size for caller in init+register" changed the > interface for sdhci_pltfm_init, while patch "mmc: sdhci-sirf: add mmc > host sdhci-pltfm based driver for SiRF SoCs" added a new driver > with the old interface. > > This changes the sirf driver to use the new interface, avoiding > one warning, and simplifying the init sequence. Since we're here > already, this also adds an error path for failed clk_prepare_enable. > > Signed-off-by: Arnd Bergmann > Cc: Christian Daudt > Cc: Barry Song > Cc: Chris Ball Thanks, fixed the conflict and pushed to mmc-next for 3.11; sorry for the delay. - Chris. -- Chris Ball One Laptop Per Child