clean remove all warnings from buildtilt-3.4-omap5-eng-12

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

32 files changed, 57 insertions, 62 deletions

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 77eac750988..3edc1f04c52 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -69,7 +69,6 @@ struct gic_chip_data {
 
 static DEFINE_RAW_SPINLOCK(irq_controller_lock);
 /* Address of GIC 0 CPU interface */
-static void __iomem *gic_cpu_base_addr __read_mostly;
 
 #ifdef CONFIG_ARM_ERRATA_4668
 static inline void gic_writel_relaxed(unsigned int v,
diff --git a/arch/arm/mach-omap2/board-omap5evm.c b/arch/arm/mach-omap2/board-omap5evm.c
index a37e0455a47..46dc2159e7b 100644
--- a/arch/arm/mach-omap2/board-omap5evm.c
+++ b/arch/arm/mach-omap2/board-omap5evm.c
@@ -891,7 +891,7 @@ static struct i2c_board_info __initdata omap5evm_i2c_1_boardinfo[] = {
 
 };
 
-
+#if 0
 static struct qtm_touch_keyarray_cfg omap5evm_key_array_data[] = {
 	{
 		.ctrl = 0,
@@ -1099,6 +1099,7 @@ static struct i2c_board_info __initdata omap5evm_i2c_4_boardinfo[] = {
 		.irq = OMAP_GPIO_IRQ(OMAP5_TOUCH_IRQ_1),
 	},
 };
+#endif
 
 /*
  * I2C GPIO Expander - TCA6424
@@ -1192,6 +1193,7 @@ static struct omap2_hsmmc_info mmc[] = {
 	{}	/* Terminator */
 };
 
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
 static struct regulator_consumer_supply omap5_sdp5430_vmmc3_supply[] = {
 	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
 };
@@ -1261,6 +1263,7 @@ static void omap5_sdp5430_wifi_init(void)
 
 	platform_device_register(&omap_vwlan_device);
 }
+#endif
 
 /* USBB3 to SMSC LAN9730 */
 #define GPIO_ETH_NRESET_SEVM	172
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 290ebb857ca..ebcb17ac1a5 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -58,11 +58,11 @@ static const char * const *mac_device_fixup_paths;
 int count_mac_device_fixup_paths;
 
 /* macro for building platform_device for McBSP ports */                        
-#define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)             \                       
-static struct platform_device omap_mcbsp##port_nr = {   \                       
-        .name   = "omap-mcbsp-dai",                     \                       
-        .id     = port_nr - 1,                  \                               
-} 
+#define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)             \
+static struct platform_device omap_mcbsp##port_nr = {   \
+        .name   = "omap-mcbsp-dai",                     \
+        .id     = port_nr - 1,                  \
+}
 
 OMAP_MCBSP_PLATFORM_DEVICE(1);
 OMAP_MCBSP_PLATFORM_DEVICE(2);
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index eb2b5de79c0..6898c483876 100644
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -115,7 +115,7 @@ u32 omap_context_registers[] = {
 	CNDP,
 	CCDN
 };
-
+#if 0
 static struct omap_device_pm_latency omap2_dma_latency[] = {
 	{
 		.deactivate_func = omap_device_idle_hwmods,
@@ -123,7 +123,7 @@ static struct omap_device_pm_latency omap2_dma_latency[] = {
 		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 	},
 };
-
+#endif
 static void __iomem *dma_base;
 static inline void dma_write(u32 val, int reg, int lch)
 {
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 779ae02f4b1..4ab7b6a1d58 100644
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -66,7 +66,7 @@ static int __init omap_init_drm(void)
 
 arch_initcall(omap_init_drm);
 
-void omapdrm_reserve_vram(void)
+void __init omapdrm_reserve_vram(void)
 {
 #ifdef CONFIG_CMA
 	/*
diff --git a/arch/arm/mach-omap2/dvfs.c b/arch/arm/mach-omap2/dvfs.c
index 6e60bc8d26a..8b8a801c198 100644
--- a/arch/arm/mach-omap2/dvfs.c
+++ b/arch/arm/mach-omap2/dvfs.c
@@ -702,8 +702,7 @@ int omap_device_scale(struct device *req_dev, struct device *target_dev,
 		return -EINVAL;
 	}
 
-	// !!! incompatible pointer type
-	od = container_of(p_dev, struct omap_device, pdev);
+	od = to_omap_device(p_dev);
 	if (IS_ERR_OR_NULL(od)) {
 		pr_err("%s: od is null!\n", __func__);
 		return -EINVAL;
diff --git a/arch/arm/mach-omap2/emif_omap.c b/arch/arm/mach-omap2/emif_omap.c
index 6ca5e8f5673..9351e576ac5 100644
--- a/arch/arm/mach-omap2/emif_omap.c
+++ b/arch/arm/mach-omap2/emif_omap.c
@@ -105,6 +105,7 @@ error:
 	return;
 }
 
+#if 0
 /*
  * Reconfigure EMIF timing registers to known values by doing a setrate
  * at the current frequency that will in turn invoke EMIF driver APIs
@@ -129,3 +130,4 @@ error:
 	pr_err("init_emif_timings failed\n");
 	return -1;
 }
+#endif
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 042c9d8b0a5..2a4b4d91433 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -327,19 +327,6 @@ static struct map_desc omap54xx_io_desc[] __initdata = {
 	},
 };
 #endif
-static void __init _omap2_map_common_io(void)
-{
-	/* Normally devicemaps_init() would flush caches and tlb after
-	 * mdesc->map_io(), but we must also do it here because of the CPU
-	 * revision check below.
-	 * AG Now moved by Jassi's patch to be earlier... leaving this in
-	 */
-	local_flush_tlb_all();
-	flush_cache_all();
-
-	omap2xxx_check_revision();
-	omap_sram_init();
-}
 
 #ifdef CONFIG_SOC_OMAP2420
 void __init omap242x_map_common_io(void)
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 3fb351aefff..0ae85153e2b 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -262,7 +262,7 @@ int __init omap_mux_init_signal(const char *muxname, int val)
 	return 0;
 }
 
-int omap_mux_init_array(struct omap_mux_setting *muxarray, int count)
+int __init omap_mux_init_array(struct omap_mux_setting *muxarray, int count)
 {
 	int r;
 
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 86be2347a36..d13bdddb699 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -220,7 +220,7 @@ int omap_mux_init_signal(const char *muxname, int val);
  * @muxarray:		pointer to list of omap_mux_setting
  * @count:		number of entries in @muxarry
  */
-int omap_mux_init_array(struct omap_mux_setting *muxarray, int count);
+int __init omap_mux_init_array(struct omap_mux_setting *muxarray, int count);
 
 /**
  * omap_hwmod_mux_init - initialize hwmod specific mux data
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index 7db2b226cdc..9730a21caa4 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -542,7 +542,7 @@ static void enable_mercury_retention_mode(void)
 int __init omap_mpuss_init(void)
 {
 	struct omap4_cpu_pm_info *pm_info;
-	u32 cpu_wakeup_addr;
+	u32 cpu_wakeup_addr = 0;
 
 	if (omap_rev() == OMAP4430_REV_ES1_0) {
 		WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 87ad304e180..e1cb72d0a66 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -465,7 +465,7 @@ static int omap2_dev_pm_qos_handler(struct notifier_block *nb,
 
 	// !!! says incompatible pointer type?
 	/* Find the associated omap_device for dev */
-	od = container_of(p_dev, struct omap_device, pdev);
+	od = to_omap_device(p_dev);
 
 	/* Find the primary omap_hwmod for dev */
 	oh = od->hwmods[0];
diff --git a/arch/arm/mach-omap2/pm4xxx_5xxx.c b/arch/arm/mach-omap2/pm4xxx_5xxx.c
index 4299c238a9a..d020cf80ac4 100644
--- a/arch/arm/mach-omap2/pm4xxx_5xxx.c
+++ b/arch/arm/mach-omap2/pm4xxx_5xxx.c
@@ -416,6 +416,7 @@ static inline u8 get_achievable_state(u8 available_states, u8 req_min_state,
 	return PWRDM_POWER_ON;
 }
 
+#if 0
 /*
  * Enable hardware supervised mode for all clockdomains if it's
  * supported. Initiate sleep transition for other clockdomains, if
@@ -430,7 +431,7 @@ static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)
 		clkdm_sleep(clkdm);
 	return 0;
 }
-
+#endif
 
 void omap4_pm_off_mode_enable(int enable)
 {
diff --git a/arch/arm/mach-omap2/scm_device.c b/arch/arm/mach-omap2/scm_device.c
index 5ead057ae14..11135a515c8 100644
--- a/arch/arm/mach-omap2/scm_device.c
+++ b/arch/arm/mach-omap2/scm_device.c
@@ -31,7 +31,7 @@
 
 static DEFINE_IDR(scm_device_idr);
 
-static int scm_dev_init(struct omap_hwmod *oh, void *user)
+static int __init scm_dev_init(struct omap_hwmod *oh, void *user)
 {
 	struct	omap4plus_scm_pdata		*scm_pdata;
 	struct	platform_device			*pd;
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 2678a76902e..2f6896de754 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -1120,7 +1120,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 	struct omap_sr_data *pdata = pdev->dev.platform_data;
 	struct resource *mem, *irq;
 	struct dentry *nvalue_dir;
-	struct dentry *lvt_nvalue_dir;
+	struct dentry *lvt_nvalue_dir = NULL;
 	struct omap_volt_data *volt_data;
 	int i, ret = 0;
 	char *name;
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 2b7a9e91656..550392e55e8 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -634,7 +634,7 @@ static void __init setup_ehci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 static struct omap_hwmod_mux_info * __init
 setup_4430ehci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 {
-	struct omap_device_pad *pads;
+	struct omap_device_pad *pads = NULL;
 	int pads_cnt = 0;
 
 	switch (port_mode[0]) {
@@ -786,7 +786,7 @@ static void __init setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 static struct omap_hwmod_mux_info * __init
 setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 {
-	struct omap_device_pad *pads;
+	struct omap_device_pad *pads = NULL;
 	int pads_cnt = 0;
 
 	switch (port_mode[0]) {
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index c3f7a1f2b0a..fd7b3b7a123 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -60,6 +60,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
 
+#if 0
 static struct omap_device_pm_latency omap_musb_latency[] = {
 	{
 		.deactivate_func	= omap_device_idle_hwmods,
@@ -67,6 +68,7 @@ static struct omap_device_pm_latency omap_musb_latency[] = {
 		.flags			= OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 	},
 };
+#endif
 
 static struct omap_musb_board_data musb_default_board_data = {
 	.interface_type		= MUSB_INTERFACE_ULPI,
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 0928b41885f..e12b5bc914e 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -298,7 +298,7 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
  * @bus_id: bus id counting from number 1
  * @pdata: pointer to the I2C bus board data
  */
-void omap_register_i2c_bus_board_data(int bus_id,
+void __init omap_register_i2c_bus_board_data(int bus_id,
 				struct omap_i2c_bus_board_data *pdata)
 {
 	BUG_ON(bus_id < 1 || bus_id > omap_i2c_nr_ports());
diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
index 55ae3bd7a84..71943756f76 100644
--- a/arch/arm/plat-omap/include/plat/i2c.h
+++ b/arch/arm/plat-omap/include/plat/i2c.h
@@ -36,7 +36,7 @@ struct omap_i2c_bus_board_data {
  * @bus_id: bus id counting from number 1
  * @pdata: pointer to the I2C bus board data
  */
-void omap_register_i2c_bus_board_data(int bus_id,
+void __init omap_register_i2c_bus_board_data(int bus_id,
 			struct omap_i2c_bus_board_data *pdata);
 
 /**
diff --git a/drivers/misc/emif.c b/drivers/misc/emif.c
index 228e2a41773..acd226de96f 100644
--- a/drivers/misc/emif.c
+++ b/drivers/misc/emif.c
@@ -169,7 +169,7 @@ static const struct file_operations emif_mr4_fops = {
 	.release		= single_release,
 };
 
-static int __init emif_debugfs_init(struct emif_data *emif)
+static int __devinit emif_debugfs_init(struct emif_data *emif)
 {
 	struct dentry	*dentry;
 	int		ret;
@@ -951,7 +951,7 @@ static void clear_all_interrupts(struct emif_data *emif)
 			base + EMIF_LL_OCP_INTERRUPT_STATUS);
 }
 
-static int __init setup_interrupts(struct emif_data *emif)
+static int __devinit setup_interrupts(struct emif_data *emif)
 {
 	u32		interrupts, type;
 	void __iomem	*base = emif->base;
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 54c83224698..22d228913cf 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1405,9 +1405,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;
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 9e656bd9820..aaad72a726d 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -310,6 +310,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
 	return ret;
 }
 
+#if 0
 static int omap_hsmmc_235_set_power(struct device *dev, int slot, int power_on,
 				   int vdd)
 {
@@ -372,6 +373,7 @@ static int omap_hsmmc_235_set_power(struct device *dev, int slot, int power_on,
 
 	return ret;
 }
+#endif
 
 static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 {
diff --git a/drivers/rpmsg/rpmsg_server_sample.c b/drivers/rpmsg/rpmsg_server_sample.c
index 838b25c1f25..944657585f1 100644
--- a/drivers/rpmsg/rpmsg_server_sample.c
+++ b/drivers/rpmsg/rpmsg_server_sample.c
@@ -71,7 +71,7 @@ static struct rpmsg_device_id rpmsg_driver_sample_id_table[] = {
 };
 MODULE_DEVICE_TABLE(rpmsg, rpmsg_driver_sample_id_table);
 
-static struct rpmsg_driver rpmsg_sample_server = {
+static struct rpmsg_driver rpmsg_sample_server_driver = {
 	.drv.name	= KBUILD_MODNAME,
 	.drv.owner	= THIS_MODULE,
 	.id_table	= rpmsg_driver_sample_id_table,
@@ -82,12 +82,12 @@ static struct rpmsg_driver rpmsg_sample_server = {
 
 static int __init init(void)
 {
-	return register_rpmsg_driver(&rpmsg_sample_server);
+	return register_rpmsg_driver(&rpmsg_sample_server_driver);
 }
 
 static void __exit fini(void)
 {
-	unregister_rpmsg_driver(&rpmsg_sample_server);
+	unregister_rpmsg_driver(&rpmsg_sample_server_driver);
 }
 module_init(init);
 module_exit(fini);
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index b3cd305bef1..15ccde5945a 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -398,7 +398,6 @@ out:
 
 static irqreturn_t twl_rtc_interrupt(int irq, void *rtc)
 {
-	struct twl_rtc_device *twl_rtc = rtc;
 	unsigned long events = 0;
 	int ret = IRQ_NONE;
 	int res;
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 2bfd4c830df..1b6890a31b4 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1062,7 +1062,7 @@ void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high)
 
 	if (dss_has_feature(FEAT_PRELOAD)) {
 		/* might as well set it to be the same high ..*/
-		dispc_write_reg(DISPC_OVL_PRELOAD(plane), min(high, 0xfff));
+		dispc_write_reg(DISPC_OVL_PRELOAD(plane), min((u32)high, (u32)0xfff));
 	}
 }
 
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index a96fc22a3e8..0683401a44b 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -29,8 +29,6 @@
 
 #include "dss.h"
 
-#define DEBUG 1
-
 static struct {
 	struct omap_dss_device *dssdev;
 	struct mutex hdmi_lock;
diff --git a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
index 77e9cfc98d8..4cc2ee11cbb 100644
--- a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
@@ -171,7 +171,7 @@ static inline void hdmi_core_ddc_req_addr(struct hdmi_ip_data *ip_data,
 	else
 		REG_FLD_MOD(core_sys_base, HDMI_CORE_I2CM_OPERATION, 1, 0, 0);
 }
-
+#if 0
 static void hdmi_core_ddc_init(struct hdmi_ip_data *ip_data)
 {
 	void __iomem *core_sys_base = hdmi_core_sys_base(ip_data);
@@ -237,11 +237,12 @@ static int hdmi_core_ddc_edid(struct hdmi_ip_data *ip_data,
 	return 0;
 
 }
+#endif
 
 int ti_hdmi_5xxx_read_edid(struct hdmi_ip_data *ip_data,
 				u8 *edid, int len)
 {
-	int r, l;
+	int r;
 
 	if (len < 128)
 		return -EINVAL;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cf54e10b258..7d711149fe5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3371,7 +3371,7 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr)
 
 	struct in_addr *in;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-	struct in6_addr *in6;
+	struct in6_addr *in6 = NULL;
 #endif
 	if (family == AF_INET) {
 		in = &((struct sockaddr_in *)addr)->sin_addr;
diff --git a/net/rpmsg/rpmsg_proto.c b/net/rpmsg/rpmsg_proto.c
index 75a61b04cd7..823f7570530 100644
--- a/net/rpmsg/rpmsg_proto.c
+++ b/net/rpmsg/rpmsg_proto.c
@@ -546,7 +546,7 @@ static struct rpmsg_device_id rpmsg_proto_id_table[] = {
 };
 MODULE_DEVICE_TABLE(rpmsg, rpmsg_proto_id_table);
 
-static struct rpmsg_driver rpmsg_proto_drv = {
+static struct rpmsg_driver rpmsg_proto_driver = {
 	.drv.name	= KBUILD_MODNAME,
 	.drv.owner	= THIS_MODULE,
 	.id_table	= rpmsg_proto_id_table,
@@ -572,7 +572,7 @@ int __init rpmsg_proto_init(void)
 	}
 
 	/* gimme rpmsg channels to expose ! */
-	ret = register_rpmsg_driver(&rpmsg_proto_drv);
+	ret = register_rpmsg_driver(&rpmsg_proto_driver);
 	if (ret) {
 		pr_err("register_rpmsg_driver failed: %d\n", ret);
 		goto sock_unreg;
@@ -589,7 +589,7 @@ proto_unreg:
 
 void __exit rpmsg_proto_exit(void)
 {
-	unregister_rpmsg_driver(&rpmsg_proto_drv);
+	unregister_rpmsg_driver(&rpmsg_proto_driver);
 	sock_unregister(PF_RPMSG);
 	proto_unregister(&rpmsg_proto);
 }
diff --git a/sound/soc/omap/abe/abe_port.c b/sound/soc/omap/abe/abe_port.c
index 1dd4849bb3b..3083fac1768 100644
--- a/sound/soc/omap/abe/abe_port.c
+++ b/sound/soc/omap/abe/abe_port.c
@@ -626,7 +626,9 @@ int omap_aess_disable_data_transfer(struct omap_aess *abe, u32 id)
 		break;
 	}
 
-	omap_aess_update_scheduling_table1(abe, &(abe_port_init[id].task), 0);
+	// !!! we are casting away the const from the task struct !!!
+	omap_aess_update_scheduling_table1(abe, (struct omap_aess_init_task1 *)
+					&(abe_port_init[id].task), 0);
 
 	omap_aess_mem_write(abe, omap_aess_map[OMAP_AESS_DMEM_MULTIFRAME_ID],
 		(u32 *) abe->MultiFrame);
@@ -660,7 +662,9 @@ int omap_aess_enable_data_transfer(struct omap_aess *abe, u32 id)
 
 	omap_aess_clean_temporary_buffers(abe, id);
 
-	omap_aess_update_scheduling_table1(abe, &(abe_port_init[id].task), 1);
+	// !!! we are casting away the const from the task struct !!!
+	omap_aess_update_scheduling_table1(abe, (struct omap_aess_init_task1 *)
+			&(abe_port_init[id].task), 1);
 
 	switch (id) {
 	case OMAP_ABE_PDM_UL_PORT:
@@ -1139,7 +1143,7 @@ void omap_aess_init_io_tasks(struct omap_aess *abe, u32 id, struct omap_aess_dat
 		 */
 		switch (id) {
 		case OMAP_ABE_VX_DL_PORT:
-			omap_aess_update_scheduling_table1(abe, &(abe_port_init[id].task), 1);
+			omap_aess_update_scheduling_table1(abe, (struct omap_aess_init_task1 *)&(abe_port_init[id].task), 1);
 
 			/* check for 8kHz/16kHz */
 			if (abe_port[id].format.f == 8000) {
@@ -1196,7 +1200,7 @@ void omap_aess_init_io_tasks(struct omap_aess *abe, u32 id, struct omap_aess_dat
 			}
 			break;
 		case OMAP_ABE_VX_UL_PORT:
-			omap_aess_update_scheduling_table1(abe, &(abe_port_init[id].task), 1);
+			omap_aess_update_scheduling_table1(abe, (struct omap_aess_init_task1 *)&(abe_port_init[id].task), 1);
 			/* check for 8kHz/16kHz */
 			if (abe_port[id].format.f == 8000) {
 				smem1 = omap_aess_update_io_task(abe, aess_enable_vx_ul_8k_asrc.task, 1);
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index c4aaf03a429..f759461b392 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -270,9 +270,10 @@ static int omap_mcbsp_dma_reg_params(struct omap_mcbsp *mcbsp,
 	defined(CONFIG_ARCH_OMAP5)
 static struct omap_device *find_omap_device_by_dev(struct device *dev)
 {
-	struct platform_device *pdev = container_of(dev,
+	struct platform_device *pdev =
+		(struct platform_device *)container_of(dev,
 					struct platform_device, dev);
-	return container_of(pdev, struct omap_device, pdev);
+	return to_omap_device(pdev);
 }
 #endif
 
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 28a2752d6b5..b68ab51c21a 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -625,7 +625,7 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = {
 	},
 	.ops = &mcbsp_dai_ops,
 };
-
+#if 0
 static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_info *uinfo)
 {
@@ -640,7 +640,7 @@ static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
 	uinfo->value.integer.max = max;
 	return 0;
 }
-
+#endif
 #define OMAP_MCBSP_ST_SET_CHANNEL_VOLUME(channel)			\
 static int								\
 omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc,	\