clean remove all warnings

Signed-off-by: Andy Green <andy.green@linaro.org>

8 files changed, 19 insertions, 15 deletions

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index e04547749cc..23a1378c36b 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -576,7 +576,6 @@ int omap_dss_reset(struct omap_hwmod *oh)
 int static __init hdmi_init_of(void)
 {
 	enum omap_hdmi_flags flags;
-	struct device_node *node;
 
 	/*
 	 * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index cfe7e43f7ba..c5e74276a8f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -469,6 +469,7 @@ static struct omap_hwmod_class omap54xx_ctrl_module_hwmod_class = {
 	.sysc	= &omap54xx_ctrl_module_sysc,
 };
 
+#if 0
 /* ctrl_module_core */
 static struct omap_hwmod_irq_info omap54xx_ctrl_module_core_irqs[] = {
 	{ .name = "sec_evts", .irq = 8 + OMAP54XX_IRQ_GIC_START },
@@ -482,6 +483,7 @@ static struct omap_hwmod omap54xx_ctrl_module_core_hwmod = {
 	.clkdm_name	= "l4cfg_clkdm",
 	.mpu_irqs	= omap54xx_ctrl_module_core_irqs,
 };
+#endif
 
 /* ctrl_module_wkup */
 static struct omap_hwmod omap54xx_ctrl_module_wkup_hwmod = {
@@ -1442,6 +1444,7 @@ static struct omap_hwmod omap54xx_gpu_hwmod = {
 	},
 };
 
+#if 0
 /*
  * 'hdq1w' class
  * hdq / 1-wire serial interface controller
@@ -1471,6 +1474,7 @@ static struct omap_hwmod omap54xx_hdq1w_hwmod = {
 		},
 	},
 };
+#endif
 
 /*
  * 'hsi' class
@@ -1741,6 +1745,7 @@ static struct omap_hwmod omap54xx_ipu_hwmod = {
 	},
 };
 
+#if 0
 /*
  * 'iss' class
  * external images sensor pixel data processor
@@ -1802,6 +1807,7 @@ static struct omap_hwmod omap54xx_iss_hwmod = {
 	.opt_clks	= iss_opt_clks,
 	.opt_clks_cnt	= ARRAY_SIZE(iss_opt_clks),
 };
+#endif
 
 /*
  * 'iva' class
@@ -3831,6 +3837,7 @@ static struct omap_hwmod_ocp_if omap54xx_ipu__l3_main_2 = {
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+#if 0
 /* iss -> l3_main_2 */
 static struct omap_hwmod_ocp_if omap54xx_iss__l3_main_2 = {
 	.master		= &omap54xx_iss_hwmod,
@@ -3838,6 +3845,7 @@ static struct omap_hwmod_ocp_if omap54xx_iss__l3_main_2 = {
 	.clk		= "dpll_core_h23x2_ck",
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
+#endif
 
 /* iva -> l3_main_2 */
 static struct omap_hwmod_ocp_if omap54xx_iva__l3_main_2 = {
@@ -4845,6 +4853,7 @@ static struct omap_hwmod_ocp_if omap54xx_l3_main_2__ipu = {
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+#if 0
 /* l3_main_2 -> iss */
 static struct omap_hwmod_ocp_if omap54xx_l3_main_2__iss = {
 	.master		= &omap54xx_l3_main_2_hwmod,
@@ -4852,6 +4861,7 @@ static struct omap_hwmod_ocp_if omap54xx_l3_main_2__iss = {
 	.clk		= "l3_div_ck",
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
+#endif
 
 /* iva -> sl2if */
 static struct omap_hwmod_ocp_if omap54xx_iva__sl2if = {
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 31ebb81c807..7c5ed698a07 100644
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -330,7 +330,6 @@ static void omap_ahci_plat_exit(struct device *dev)
 void __init omap_sata_init(void)
 {
 	struct omap_hwmod	*hwmod[2];
-	struct omap_device	*od;
 	struct platform_device	*pdev;
 	struct device		*dev;
 	int			oh_cnt = 1;
@@ -354,16 +353,15 @@ void __init omap_sata_init(void)
 	else
 		pr_err("Could not look up %s\n", OMAP_OCP2SCP3_HWMODNAME);
 
-	od = omap_device_build_ss(AHCI_PLAT_DEVNAME, -1, hwmod, oh_cnt,
+	pdev = omap_device_build_ss(AHCI_PLAT_DEVNAME, -1, hwmod, oh_cnt,
 				(void *) &sata_pdata, sizeof(sata_pdata),
 				omap_sata_latency,
 				ARRAY_SIZE(omap_sata_latency), false);
-	if (IS_ERR(od)) {
+	if (IS_ERR(pdev)) {
 		pr_err("Could not build hwmod device %s\n",
 					OMAP_SATA_HWMODNAME);
 		return;
 	}
-	pdev = &od->pdev;
 	dev = &pdev->dev;
 	get_device(dev);
 	dev->dma_mask = &sata_dmamask;
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index ba33144257e..754bc96e10c 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -470,7 +470,7 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
 {
 	struct pci_dev *root;
 	int pos;
-	u32 lnkcap, lnkcap2;
+	u32 lnkcap = 0, lnkcap2 = 0;
 
 	*mask = 0;
 	if (!dev->pdev)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e02cd788516..da6404b1581 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1388,9 +1388,6 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
 	return 0;
 }
 
-static int
-mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card);
-
 static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 {
 	int ret;
@@ -1398,10 +1395,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 	struct mmc_card *card = md->queue.card;
 
 #ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
-	if (mmc_bus_needs_resume(card->host)) {
+	if (mmc_bus_needs_resume(card->host))
 		mmc_resume_bus(card->host);
-//		mmc_blk_set_blksize(md, card);
-	}
 #endif
 
 	if (req && !mq->mqrq_prev->req)
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 53ed57567ce..9b9e889f331 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -767,12 +767,12 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
  * descriptor to memory.
  */
 #ifdef	CONFIG_ARM_DMA_MEM_BUFFERABLE
-static inline void ehci_sync_mem()
+static inline void ehci_sync_mem(void)
 {
 	mb();
 }
 #else
-static inline void ehci_sync_mem()
+static inline void ehci_sync_mem(void)
 {
 }
 #endif
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 488e031f7c7..01ae60b2cbc 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -387,7 +387,7 @@ static int __init hdmi_init_display(struct omap_dss_device *dssdev)
 	return 0;
 }
 
-static void __exit hdmi_uninit_display(struct omap_dss_device *dssdev)
+static void hdmi_uninit_display(struct omap_dss_device *dssdev)
 {
 	DSSDBG("uninit_display\n");
 
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 3595a0236b0..a2763f7c4f0 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -330,6 +330,8 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr)
 {
 	map_word r;
 
+	r.x[0] = 0;
+
 	if (map_bankwidth_is_1(map))
 		r.x[0] = *(unsigned char *)ptr;
 	else if (map_bankwidth_is_2(map))