OMAP4: HSI: fix checkpatch & build warnings

Change-Id: I3a21ff3214566010a9963e0f279cbd954685fcaa
Signed-off-by: Djamil Elaidi <d-elaidi@ti.com>

5 files changed, 4 insertions, 23 deletions

diff --git a/drivers/omap_hsi/hsi-char.c b/drivers/omap_hsi/hsi-char.c
index abd4034..a284fd2 100644
--- a/drivers/omap_hsi/hsi-char.c
+++ b/drivers/omap_hsi/hsi-char.c
@@ -580,7 +580,6 @@ out_device_destroy:
 	for (i = 0; (i < i_dev_create) && channels_map[i]; i++)
 		device_destroy(hsi_char_class,
 			       MKDEV(hsi_char_major, channels_map[i] - 1));
-out_class_destroy:
 	class_destroy(hsi_char_class);
 out_cdev_del:
 	cdev_del(&hsi_char_cdev);
@@ -588,7 +587,7 @@ out_unregister_chrdev:
 	unregister_chrdev_region(hsi_char_dev, num_channels);
 out_hsi_exit:
 	if_hsi_exit();
-out:
+
 	return ret;
 }
 
diff --git a/drivers/omap_hsi/hsi_driver.c b/drivers/omap_hsi/hsi_driver.c
index c812859..0fc256f 100644
--- a/drivers/omap_hsi/hsi_driver.c
+++ b/drivers/omap_hsi/hsi_driver.c
@@ -36,10 +36,6 @@
 
 #include "hsi_driver.h"
 
-#if 0
-static struct pm_qos_request_list *pm_qos_handle;
-#endif
-
 #define HSI_MODULENAME "omap_hsi"
 #define	HSI_DRIVER_VERSION	"0.4.3"
 #define HSI_RESETDONE_MAX_RETRIES	5 /* Max 5*L4 Read cycles waiting for */
@@ -819,10 +815,7 @@ static int __init hsi_platform_device_probe(struct platform_device *pd)
 			" %d\n", err);
 		goto rollback1;
 	}
-	/* Wakeup dependency was disabled for HSI <-> MPU PM_L3INIT_HSI_WKDEP */
-#if 0
-	omap_writel(0x141, 0x4A307338);
-#endif
+
 	pm_runtime_enable(hsi_ctrl->dev);
 	pm_runtime_irq_safe(hsi_ctrl->dev);
 	hsi_clocks_enable(hsi_ctrl->dev, __func__);
diff --git a/drivers/omap_hsi/hsi_driver.h b/drivers/omap_hsi/hsi_driver.h
index 5ea6c02..411b488 100644
--- a/drivers/omap_hsi/hsi_driver.h
+++ b/drivers/omap_hsi/hsi_driver.h
@@ -421,7 +421,7 @@ extern void omap_pm_clear_dsp_wake_up(void);
 #else
 #define IS_HSI_PM44XX_ERRATUM(id)		0
 #define OMAP4_PM_ERRATUM_HSI_SWAKEUP_iXXX       0
-#define static inline void omap_pm_clear_dsp_wake_up(void) { }
+static inline void omap_pm_clear_dsp_wake_up(void) { }
 #endif
 
 #endif /* __HSI_DRIVER_H__ */
diff --git a/drivers/omap_hsi/hsi_driver_dma.c b/drivers/omap_hsi/hsi_driver_dma.c
index 4cffd0c..6cdf693 100644
--- a/drivers/omap_hsi/hsi_driver_dma.c
+++ b/drivers/omap_hsi/hsi_driver_dma.c
@@ -223,13 +223,6 @@ int hsi_driver_read_dma(struct hsi_channel *hsi_channel, u32 * data,
 	 * received data word)
 	 * (Rx interrupt might be active for polling feature)
 	 */
-#if 0
-	if (omap_readl(0x4A05A810)) {
-		dev_err(hsi_ctrl->dev,
-			"READ INTERRUPT IS PENDING DMA() but still disabling %0x\n",
-			omap_readl(0x4A05A810));
-	}
-#endif
 	hsi_driver_disable_read_interrupt(hsi_channel);
 
 	/*
diff --git a/drivers/omap_hsi/hsi_driver_if.c b/drivers/omap_hsi/hsi_driver_if.c
index d6b934e..28b3bb5 100644
--- a/drivers/omap_hsi/hsi_driver_if.c
+++ b/drivers/omap_hsi/hsi_driver_if.c
@@ -447,11 +447,7 @@ int hsi_read(struct hsi_device *dev, u32 *addr, unsigned int size)
 			"hsi_device %p data %p count %d", dev, addr, size);
 		return -EINVAL;
 	}
-#if 0
-	if (dev->n_ch == 0)
-		dev_info(dev->device.parent, "%s ch %d, @%x, size %d u32\n",
-			__func__, dev->n_ch, (u32) addr, size);
-#endif
+
 	if (unlikely(!(dev->ch->flags & HSI_CH_OPEN))) {
 		dev_err(dev->device.parent, "HSI device NOT open\n");
 		return -EINVAL;