[(mmc-next),3/3] mmc: fix a warning when compile the sdhci d.d.

Commit Message

Peppe CAVALLARO Sept. 23, 2010, 9:14 a.m. UTC

None

Patch

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 <linux/io.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/scatterlist.h>
 #include <linux/regulator/consumer.h>
 
-#include <linux/leds.h>
-
-#include <linux/mmc/host.h>
-
 #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;