From patchwork Thu Sep 23 09:14:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peppe CAVALLARO X-Patchwork-Id: 201542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8N9EbxF012257 for ; Thu, 23 Sep 2010 09:14:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752619Ab0IWJOp (ORCPT ); Thu, 23 Sep 2010 05:14:45 -0400 Received: from eu1sys200aog109.obsmtp.com ([207.126.144.127]:39267 "EHLO eu1sys200aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752255Ab0IWJOp (ORCPT ); Thu, 23 Sep 2010 05:14:45 -0400 Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob109.postini.com ([207.126.147.11]) with SMTP ID DSNKTJsag/md4xoG9sNry/ggG9ayxtlbYJO8@postini.com; Thu, 23 Sep 2010 09:14:44 UTC Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 57CE9128 for ; Thu, 23 Sep 2010 09:14:43 +0000 (GMT) Received: from mail3.ctn.st.com (mail3.ctn.st.com [164.130.116.150]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2135F1EFE for ; Thu, 23 Sep 2010 09:14:43 +0000 (GMT) Received: from localhost ([164.130.129.16]) by mail3.ctn.st.com (MOS 3.8.7a) with ESMTP id DEH00305 (AUTH cavagiu); Thu, 23 Sep 2010 11:14:42 +0200 (CEST) From: Giuseppe CAVALLARO To: linux-mmc@vger.kernel.org Cc: Giuseppe Cavallaro Subject: [PATCH (mmc-next) 3/3] mmc: fix a warning when compile the sdhci d.d. Date: Thu, 23 Sep 2010 11:14:26 +0200 Message-Id: <1285233266-5039-3-git-send-email-peppe.cavallaro@st.com> X-Mailer: git-send-email 1.5.5.6 In-Reply-To: <1285233266-5039-2-git-send-email-peppe.cavallaro@st.com> References: <1285233266-5039-1-git-send-email-peppe.cavallaro@st.com> <1285233266-5039-2-git-send-email-peppe.cavallaro@st.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 23 Sep 2010 09:14:46 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 5928b0a..058dacd 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -18,13 +18,8 @@ #include #include #include -#include #include -#include - -#include - #include "sdhci.h" #define DRIVER_NAME "sdhci" @@ -1050,11 +1045,9 @@ out: static void sdhci_set_power(struct sdhci_host *host, unsigned short power) { - u8 pwr; + u8 pwr = 0; - if (power == (unsigned short)-1) - pwr = 0; - else { + if (power != (unsigned short)-1) { switch (1 << power) { case MMC_VDD_165_195: pwr = SDHCI_POWER_180;