ccwmx5x: Clean build with no PM support.

This fixes v40297.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>

5 files changed, 19 insertions, 1 deletions

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 0efe631e50ca..d80cfdc8edd2 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 	init_waitqueue_head(&host->wq);
 	INIT_DELAYED_WORK(&host->detect, mmc_rescan);
 	INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable);
+#ifdef CONFIG_PM
 	host->pm_notify.notifier_call = mmc_pm_notify;
+#endif
 
 	/*
 	 * By default, hosts do not support SGIO or large requests.
diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c
index 859eba6dea67..d75d2de1bab3 100644
--- a/drivers/mxc/vpu/mxc_vpu.c
+++ b/drivers/mxc/vpu/mxc_vpu.c
@@ -67,7 +67,9 @@ static DEFINE_SPINLOCK(vpu_lock);
 static LIST_HEAD(head);
 
 static int vpu_major;
+#ifdef CONFIG_PM
 static int vpu_clk_usercount;
+#endif
 static struct class *vpu_class;
 static struct vpu_priv vpu_data;
 static u8 open_count;
@@ -89,10 +91,12 @@ static struct iram_setting iram;
 static int codec_done;
 static wait_queue_head_t vpu_queue;
 
+#ifdef CONFIG_PM
 static u32 workctrl_regsave[6];
 static u32 rd_ptr_regsave[4];
 static u32 wr_ptr_regsave[4];
 static u32 dis_flag_regsave[4];
+#endif
 
 #define	READ_REG(x)		__raw_readl(vpu_base + x)
 #define	WRITE_REG(val, x)	__raw_writel(val, vpu_base + x)
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index 9cb8a1ff52ba..09900be5897d 100644
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -31,6 +31,8 @@
 
 extern int usb_host_wakeup_irq(struct device *wkup_dev);
 extern void usb_host_set_wakeup(struct device *wkup_dev, bool para);
+
+#ifdef CONFIG_PM
 static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool enable)
 {
 	if (enable) {
@@ -43,6 +45,7 @@ static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool ena
 
 	pdata->lowpower = enable;
 }
+#endif
 
 static void fsl_usb_clk_gate(struct fsl_usb2_platform_data *pdata, bool enable)
 {
@@ -369,6 +372,7 @@ static int ehci_fsl_reinit(struct ehci_hcd *ehci)
 	return 0;
 }
 
+#ifdef CONFIG_PM
 static int ehci_fsl_bus_suspend(struct usb_hcd *hcd)
 {
 	int ret = 0;
@@ -432,6 +436,7 @@ static int ehci_fsl_bus_resume(struct usb_hcd *hcd)
 
 	return ret;
 }
+#endif
 
 static void ehci_fsl_shutdown(struct usb_hcd *hcd)
 {
@@ -521,8 +526,10 @@ static const struct hc_driver ehci_fsl_hc_driver = {
 	 */
 	.hub_status_data = ehci_hub_status_data,
 	.hub_control = ehci_hub_control,
+#ifdef CONFIG_PM
 	.bus_suspend = ehci_fsl_bus_suspend,
 	.bus_resume = ehci_fsl_bus_resume,
+#endif
 	.relinquish_port = ehci_relinquish_port,
 	.port_handed_over = ehci_port_handed_over,
 
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index 4a48a02d62e0..4ee475fdf17c 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -682,7 +682,9 @@ static void fsl_otg_event(struct work_struct *work)
 	struct otg_fsm *fsm = &og->fsm;
 	struct otg_transceiver *otg = &og->otg;
 
+#ifdef CONFIG_PM
 	mutex_lock(&pm_mutex);
+#endif
 	b_session_irq_enable(false);
 	otg->default_a = (fsm->id == 0);
 	/* clear conn information */
@@ -703,7 +705,9 @@ static void fsl_otg_event(struct work_struct *work)
 		b_session_irq_enable(false);
 		fsl_otg_start_host(fsm, 1);
 	}
+#ifdef CONFIG_PM
 	mutex_unlock(&pm_mutex);
+#endif
 }
 
 /* B-device start SRP */
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 03cb7c05ebec..b8d471465b39 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -437,8 +437,9 @@ static inline void dapm_clear_walk(struct snd_soc_codec *codec)
  */
 static int snd_soc_dapm_suspend_check(struct snd_soc_dapm_widget *widget)
 {
-	struct snd_soc_codec *codec = widget->codec;
+	struct snd_soc_codec *codec;
 
+	codec  = widget->codec;
 	switch (snd_power_get_state(codec->card)) {
 	case SNDRV_CTL_POWER_D3hot:
 	case SNDRV_CTL_POWER_D3cold: