[PATCH 21/23] dove: fix compilation warnings

Brad Figg brad.figg at canonical.com
Thu Aug 27 23:21:01 UTC 2009


From: Saeed Bishara <saeed at marvell.com>

Signed-off-by: Saeed Bishara <saeed at marvell.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 arch/arm/mm/dma-mapping.c   |    4 +---
 drivers/mmc/host/sdhci-mv.c |    6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 236ed26..05722b2 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -202,10 +202,8 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
 		gfp |= GFP_DMA;
 
 	page = alloc_pages(gfp, order);
-	if (!page){
-	     printk("%s %d: failed to alloc pages order %d\n",__func__, __LINE__, order);
+	if (!page)
 		goto no_page;
-	}
 
 	/*
 	 * Invalidate any data that might be lurking in the
diff --git a/drivers/mmc/host/sdhci-mv.c b/drivers/mmc/host/sdhci-mv.c
index 9f6f3ab..d3b285a 100755
--- a/drivers/mmc/host/sdhci-mv.c
+++ b/drivers/mmc/host/sdhci-mv.c
@@ -144,7 +144,7 @@ static void sdhci_sdio_gpio_irq_disable(struct sdhci_host *host)
 
 	mmiowb();
 }
-
+#ifdef DEBUG
 static void sdhci_sdio_gpio_irq_dump(struct sdhci_host *host)
 {
 	struct sdhci_mv_host *mv_host = sdhci_priv(host);
@@ -165,7 +165,7 @@ static void sdhci_sdio_gpio_irq_dump(struct sdhci_host *host)
 	printk(" gpio data in [0x%x] 0x%08x\n", GPIO_DATA_IN(gpio),
 	       readl(GPIO_DATA_IN(gpio)));
 }
-
+#endif
 static int __devinit sdhci_mv_probe(struct platform_device *pdev)
 {
 	struct sdhci_host *host;
@@ -173,7 +173,7 @@ static int __devinit sdhci_mv_probe(struct platform_device *pdev)
 	struct resource *r;
 	struct sdhci_dove_int_wa *data = (struct sdhci_dove_int_wa *)
 		pdev->dev.platform_data;
-	int ret;
+	int ret = 0;
 
 	host = sdhci_alloc_host(&pdev->dev, sizeof(*mv_host));
 	if (IS_ERR(host)) {
-- 
1.6.0.4





More information about the kernel-team mailing list